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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
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}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
… …
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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
376} 377}
377 378
378sub set_max_size { 379sub set_max_size {
379 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
380 381
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
383} 386}
384 387
385sub set_tooltip { 388sub set_tooltip {
386 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
387 390
… …
392 395
393 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
394 397
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 401 }
399} 402}
400 403
401# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
402sub coord2local { 405sub coord2local {
… …
410 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
411 414
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 416}
414 417
415sub focus_in { 418sub invoke_focus_in {
416 my ($self) = @_; 419 my ($self) = @_;
417 420
418 return if $FOCUS == $self; 421 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
420 423
421 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
422 425
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 426 $focus->update if $focus;
426 $FOCUS->update; 427 $FOCUS->update;
427}
428 428
429 0
430}
431
429sub focus_out { 432sub invoke_focus_out {
430 my ($self) = @_; 433 my ($self) = @_;
431 434
432 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
433 436
434 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
435 438
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 439 $focus->update if $focus; #?
439 440
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 442 unless $FOCUS;
442}
443 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
444sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
445sub button_up { } 454sub invoke_button_up { 1 }
446sub key_down { } 455sub invoke_key_down { 1 }
447sub key_up { } 456sub invoke_key_up { 1 }
448 457
449sub button_down { 458sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
451 460
452 $self->focus_in; 461 $self->grab_focus;
462
463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 478}
454 479
455sub find_widget { 480sub find_widget {
456 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
457 482
… …
467sub set_parent { 492sub set_parent {
468 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
469 494
470 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 497}
496 498
497sub realloc { 499sub realloc {
498 my ($self) = @_; 500 my ($self) = @_;
499 501
… …
529sub draw { 531sub draw {
530 my ($self) = @_; 532 my ($self) = @_;
531 533
532 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
533 535
536 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 537 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
536 541
537 return if $draw_x + $self->{w} < 0; 542 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 545
542 glPushMatrix; 546 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 548
547 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 551 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 553 glBegin GL_QUADS;
554 glVertex $x , $y; 554 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
558 glEnd; 558 glEnd;
559 glDisable GL_BLEND; 559 glDisable GL_BLEND;
560 } 560 }
561 561
562 if ($ENV{CFPLUS_DEBUG} & 1) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 563 glPushMatrix;
564 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 567 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
571 glEnd; 571 glEnd;
572 glPopMatrix; 572 glPopMatrix;
573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
575} 578}
576 579
577sub _draw { 580sub _draw {
578 my ($self) = @_; 581 my ($self) = @_;
579 582
… …
582 585
583sub DESTROY { 586sub DESTROY {
584 my ($self) = @_; 587 my ($self) = @_;
585 588
586 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
587 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
588} 593}
589 594
590############################################################################# 595#############################################################################
591 596
592package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
617 622
618 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
620 625
621 glEnable GL_BLEND; 626 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 628 glColor_premultiply @$color;
624 629
625 glBegin GL_QUADS; 630 glBegin GL_QUADS;
626 glVertex 0 , 0; 631 glVertex 0 , 0;
627 glVertex 0 , $h; 632 glVertex 0 , $h;
628 glVertex $w, $h; 633 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
660 665
661sub new { 666sub new {
662 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
663 668
664 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
665 670
666 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
667 children => [], 672 children => [],
668 can_events => 0, 673 can_events => 0,
669 %arg, 674 %arg,
670 ); 675 );
676
671 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
672 679
673 $self 680 $self
674} 681}
675 682
676sub add { 683sub add {
… …
724 $x -= $self->{x}; 731 $x -= $self->{x};
725 $y -= $self->{y}; 732 $y -= $self->{y};
726 733
727 my $res; 734 my $res;
728 735
729 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
731 and return $res; 738 and return $res;
732 } 739 }
733 740
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
755} 762}
756 763
757sub add { 764sub add {
758 my ($self, $child) = @_; 765 my ($self, $child) = @_;
759 766
760 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
761
762 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
763} 769}
764 770
765sub remove { 771sub remove {
766 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
775 781
776sub size_request { 782sub size_request {
777 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
778} 784}
779 785
780sub size_allocate { 786sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
782 788
783 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
784} 792}
785 793
786############################################################################# 794#############################################################################
795
796# back-buffered drawing area
787 797
788package CFClient::UI::Window; 798package CFClient::UI::Window;
789 799
790our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
791 801
… …
802 812
803 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
804 $self->SUPER::update; 814 $self->SUPER::update;
805} 815}
806 816
807sub size_allocate { 817sub invoke_size_allocate {
808 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
809 819
810 $self->SUPER::size_allocate ($w, $h);
811 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
812} 823}
813 824
814sub _render { 825sub _render {
815 my ($self) = @_; 826 my ($self) = @_;
816 827
… …
843 my $tex = $self->{texture} 854 my $tex = $self->{texture}
844 or return; 855 or return;
845 856
846 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
849 860
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 862
852 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
853} 864}
… …
877 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
878 889
879 ($w, $h) 890 ($w, $h)
880} 891}
881 892
882sub size_allocate { 893sub invoke_size_allocate {
883 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
884 895
885 my $child = $self->child; 896 my $child = $self->child;
886 897
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889 900
890 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
891 $self->update; 902 $self->update;
903
904 1
892} 905}
893 906
894sub set_offset { 907sub set_offset {
895 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
896 909
… …
944package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
945 958
946our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
947 960
948sub new { 961sub new {
949 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
950 965
951 my $self; 966 my $self;
952 967
953 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
954 vertical => 1, 969 vertical => 1,
… …
959 ; 974 ;
960 975
961 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 978 slider => $slider,
964 @_, 979 %arg,
965 ); 980 );
966 981
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
970 984
971 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
972} 992}
973 993
974sub update { 994sub update {
975 my ($self) = @_; 995 my ($self) = @_;
976 996
… …
979 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982} 1002}
983 1003
984sub size_allocate { 1004sub invoke_size_allocate {
985 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988 1006
989 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
991} 1011}
992 1012
993#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll 1014# update viewport offset on scroll
995 1015
… …
1015 1035
1016 if ($self->{bg}) { 1036 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
1018 1038
1019 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
1022 1042
1023 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1044 glVertex 0 , 0;
1025 glVertex 0 , $h; 1045 glVertex 0 , $h;
1026 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1048my @border = 1068my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051 1071
1052sub new { 1072sub new {
1053 my $class = shift; 1073 my ($class, %arg) = @_;
1054 1074
1055 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1078 border => 0.6,
1059 can_events => 1, 1079 can_events => 1,
1060 min_w => 16, 1080 min_w => 16,
1061 min_h => 16, 1081 min_h => 16,
1062 @_ 1082 %arg,
1063 ); 1083 );
1064 1084
1065 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1066 align => 0, 1086 align => 0,
1067 valign => 1, 1087 valign => 1,
1068 text => $self->{title}, 1088 text => $self->{title},
1069 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1070 1100
1071 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1072} 1110}
1073 1111
1074sub border { 1112sub border {
1075 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1076} 1114}
1077 1115
1078sub size_request { 1116sub size_request {
1079 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1080 1124
1081 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1082 1126
1083 ( 1127 (
1084 $w + $self->border * 2, 1128 $w + $self->border * 2,
1085 $h + $self->border * 2, 1129 $h + $self->border * 2,
1086 ) 1130 )
1087} 1131}
1088 1132
1089sub size_allocate { 1133sub invoke_size_allocate {
1090 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1091 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
1092 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1094 1146
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1099}
1100 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1101sub button_down { 1155sub invoke_button_down {
1102 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1103 1157
1104 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1105 my $border = $self->border; 1159 my $border = $self->border;
1106 1160
… …
1122 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1123 1177
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1182 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1183 };
1130 1184
1131 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1137 1191
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1193
1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1141 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1142 } 1202 1
1143} 1203}
1144 1204
1145sub button_up { 1205sub invoke_button_up {
1146 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1147 1207
1148 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1149} 1209}
1150 1210
1151sub mouse_motion { 1211sub invoke_mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1153 1213
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1155} 1217}
1156 1218
1157sub _draw { 1219sub _draw {
1158 my ($self) = @_; 1220 my ($self) = @_;
1159 1221
1222 my $child = $self->{children}[0];
1223
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1226
1163 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1229
1166 my $border = $self->border; 1230 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1246 }
1183 1247
1184 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1185 1249
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1189} 1261}
1190 1262
1191############################################################################# 1263#############################################################################
1192 1264
1193package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1216 1288
1217 $child->set_parent ($self); 1289 $child->set_parent ($self);
1218 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1219 1291
1220 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1221} 1299}
1222 1300
1223# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1224sub clear { 1302sub clear {
1225 my ($self) = @_; 1303 my ($self) = @_;
… …
1266 (sum @$ws), 1344 (sum @$ws),
1267 (sum @$hs), 1345 (sum @$hs),
1268 ) 1346 )
1269} 1347}
1270 1348
1271sub size_allocate { 1349sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1273 1351
1274 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1275 1353
1276 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1308 } 1386 }
1309 1387
1310 $y += $row_h; 1388 $y += $row_h;
1311 } 1389 }
1312 1390
1391 1
1313} 1392}
1314 1393
1315sub find_widget { 1394sub find_widget {
1316 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1317 1396
… …
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 ) 1435 )
1357} 1436}
1358 1437
1359sub size_allocate { 1438sub invoke_size_allocate {
1360 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1361 1440
1362 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1363 my $children = $self->{children}; 1442 my $children = $self->{children};
1364 1443
… …
1486 1565
1487 delete $self->{texture}; 1566 delete $self->{texture};
1488 $self->SUPER::update; 1567 $self->SUPER::update;
1489} 1568}
1490 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1491sub set_text { 1577sub set_text {
1492 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1493 1579
1494 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1496 1582
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1499 1585
1586 delete $self->{size_req};
1500 $self->realloc; 1587 $self->realloc;
1501 $self->update; 1588 $self->update;
1502} 1589}
1503 1590
1504sub set_markup { 1591sub set_markup {
… …
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1598
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1513 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1514 1601
1602 delete $self->{size_req};
1515 $self->realloc; 1603 $self->realloc;
1516 $self->update; 1604 $self->update;
1517} 1605}
1518 1606
1519sub size_request { 1607sub size_request {
1520 my ($self) = @_; 1608 my ($self) = @_;
1521 1609
1610 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1616
1528 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1529 1618
1530 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1622
1534 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1535 1624
1536 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1538 } 1630 };
1539 1631
1540 ($w, $h) 1632 @{ $self->{size_req} }
1541} 1633}
1542 1634
1543sub size_allocate { 1635sub invoke_size_allocate {
1544 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1545 1639
1546 delete $self->{texture} 1640 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1548} 1644}
1549 1645
1550sub set_fontsize { 1646sub set_fontsize {
1551 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1552 1648
1553 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1554 delete $self->{texture}; 1650 delete $self->{texture};
1555 1651
1556 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1557} 1661}
1558 1662
1559sub _draw { 1663sub _draw {
1560 my ($self) = @_; 1664 my ($self) = @_;
1561 1665
… …
1567 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1675
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1573 1678
1679 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1577 1683
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1687 };
1584 1688
1585 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1587 1693
1588 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1591 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1593 } 1701 }
1594 1702
1595 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1596} 1704}
1597 1705
… …
1614 can_hover => 1, 1722 can_hover => 1,
1615 can_focus => 1, 1723 can_focus => 1,
1616 valign => 0, 1724 valign => 0,
1617 can_events => 1, 1725 can_events => 1,
1618 #text => ... 1726 #text => ...
1727 #hidden => "*",
1619 @_ 1728 @_
1620 ) 1729 )
1621} 1730}
1622 1731
1623sub _set_text { 1732sub _set_text {
… …
1625 1734
1626 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1627 1736
1628 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1629 1738
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1740 $self->{text} = $text;
1634 1741
1635 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1637 1745
1638 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1639} 1750}
1640 1751
1641sub set_text { 1752sub set_text {
1642 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1643 1754
1644 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1756 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1757}
1649 1758
1650sub get_text { 1759sub get_text {
1651 $_[0]{text} 1760 $_[0]{text}
1652} 1761}
… …
1657 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1658 1767
1659 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1660} 1769}
1661 1770
1662sub key_down { 1771sub invoke_key_down {
1663 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1664 1773
1665 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1666 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1667 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1679 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1680 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1681 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1682 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1793 $self->emit ('escape');
1685 } elsif ($uni) { 1794 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1687 } 1798 }
1688 1799
1689 $self->_set_text ($text); 1800 $self->_set_text ($text);
1690 1801
1691 $self->realloc; 1802 $self->realloc;
1692}
1693 1803
1804 1
1805}
1806
1694sub focus_in { 1807sub invoke_focus_in {
1695 my ($self) = @_; 1808 my ($self) = @_;
1696 1809
1697 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1698 1811
1699 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1700} 1813}
1701 1814
1702sub button_down { 1815sub invoke_button_down {
1703 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1704 1817
1705 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1706 1819
1707 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1708 1821
1709 # byte-index to char-index 1822 # byte-index to char-index
1710 my $text = $self->{text}; 1823 my $text = $self->{text};
1711 utf8::encode $text; 1824 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1713 1826
1714 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1715 $self->update; 1828 $self->update;
1829
1830 1
1716} 1831}
1717 1832
1718sub mouse_motion { 1833sub invoke_mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1720# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1721} 1838}
1722 1839
1723sub _draw { 1840sub _draw {
1724 my ($self) = @_; 1841 my ($self) = @_;
1725 1842
1726 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1727 1844
1728 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1731 } else { 1848 } else {
1732 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1733 } 1850 }
1734 1851
1735 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1855 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1766 1883
1767our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1768 1885
1769use CFClient::OpenGL; 1886use CFClient::OpenGL;
1770 1887
1771sub key_down { 1888sub invoke_key_down {
1772 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1773 1890
1774 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1775 1892
1776 if ($sym == 13) { 1893 if ($sym == 13) {
1777 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1778 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1779 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1781 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1782 $self->update; 1899 $self->update;
1783 1900
1784 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1802 } else { 1919 } else {
1803 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1804 } 1921 }
1805 1922
1806 } else { 1923 } else {
1807 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1808 } 1927 1
1809
1810} 1928}
1811 1929
1812############################################################################# 1930#############################################################################
1813 1931
1814package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1835 can_events => 1, 1953 can_events => 1,
1836 @_ 1954 @_
1837 ) 1955 )
1838} 1956}
1839 1957
1840sub activate { }
1841
1842sub button_up { 1958sub invoke_button_up {
1843 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1844 1960
1845 $self->emit ("activate") 1961 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
1964
1965 1
1848} 1966}
1849 1967
1850sub _draw { 1968sub _draw {
1851 my ($self) = @_; 1969 my ($self) = @_;
1852 1970
1853 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1972
1859 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1862 1976
1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1864 1978
1865 glDisable GL_TEXTURE_2D; 1979 glDisable GL_TEXTURE_2D;
1866 1980
1867 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1982}
1983
1984#############################################################################
1985
1986package CFClient::UI::ImageButton;
1987
1988our @ISA = CFClient::UI::Image::;
1989
1990use CFClient::OpenGL;
1991
1992my %textures;
1993
1994sub new {
1995 my $class = shift;
1996
1997 my $self = $class->SUPER::new (
1998 padding_x => 4,
1999 padding_y => 4,
2000 fg => [1, 1, 1],
2001 active_fg => [0, 0, 1],
2002 can_hover => 1,
2003 align => 0,
2004 valign => 0,
2005 can_events => 1,
2006 @_
2007 );
2008}
2009
2010sub invoke_button_up {
2011 my ($self, $ev, $x, $y) = @_;
2012
2013 $self->emit ("activate")
2014 if $x >= 0 && $x < $self->{w}
2015 && $y >= 0 && $y < $self->{h};
2016
2017 1
1868} 2018}
1869 2019
1870############################################################################# 2020#############################################################################
1871 2021
1872package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
… …
1899 my ($self) = @_; 2049 my ($self) = @_;
1900 2050
1901 (6) x 2 2051 (6) x 2
1902} 2052}
1903 2053
1904sub button_down { 2054sub invoke_button_down {
1905 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1906 2056
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1911 } 2065 1
1912} 2066}
1913 2067
1914sub _draw { 2068sub _draw {
1915 my ($self) = @_; 2069 my ($self) = @_;
1916 2070
… …
2083 2237
2084 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
2086 2240
2087 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2246
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
2207 $self->update; 2362 $self->update;
2208 2363
2209 $self 2364 $self
2210} 2365}
2211 2366
2212sub changed { }
2213
2214sub set_range { 2367sub set_range {
2215 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2216 2369
2217 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2218 2371
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2221} 2376}
2222 2377
2223sub set_value { 2378sub set_value {
2224 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2225 2380
… …
2236 if $unit; 2391 if $unit;
2237 2392
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239 2394
2240 if ($value != $old_value) { 2395 if ($value != $old_value) {
2241 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2242 $self->update; 2397 $self->update;
2243 } 2398 }
2244} 2399}
2245 2400
2246sub size_request { 2401sub size_request {
2247 my ($self) = @_; 2402 my ($self) = @_;
2248 2403
2249 ($self->{req_w}, $self->{req_h}) 2404 ($self->{req_w}, $self->{req_h})
2250} 2405}
2251 2406
2252sub button_down { 2407sub invoke_button_down {
2253 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2254 2409
2255 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2256 2411
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2413
2259 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2260} 2415}
2261 2416
2262sub mouse_motion { 2417sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2264 2419
2265 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267 2422
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2423 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2424
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2425 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2426
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2427 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2428 } else {
2429 return 0;
2430 }
2431
2273 } 2432 1
2274} 2433}
2275 2434
2276sub update { 2435sub update {
2277 my ($self) = @_; 2436 my ($self) = @_;
2278 2437
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2438 delete $self->{knob_w};
2439 $self->SUPER::update;
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2446 $self->set_value ($self->{range}[0]);
2281 2447
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2449 my $range = ($hi - $page - $lo) || 1e-100;
2284 2450
… …
2290 $value = ($value - $lo) / $range; 2456 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2457 $value = $value * $self->{scale} + $self->{offset};
2292 2458
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2460 $self->{knob_w} = $knob_w;
2295 }); 2461 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2462
2303 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2304 2464
2305 glScale $self->{w}, $self->{h}; 2465 glScale $self->{w}, $self->{h};
2306 2466
… …
2367sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2369 2529
2370############################################################################# 2530#############################################################################
2371 2531
2372package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2373 2533
2374our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2375 2535
2376use CFClient::OpenGL; 2536use CFClient::OpenGL;
2377 2537
… …
2379 my $class = shift; 2539 my $class = shift;
2380 2540
2381 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2382 fontsize => 1, 2542 fontsize => 1,
2383 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2384 #font => default_font 2545 #font => default_font
2385 @_, 2546 @_,
2386 2547
2387 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2388 par => [], 2549 par => [],
… …
2403 2564
2404 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2405 $self->reflow; 2566 $self->reflow;
2406} 2567}
2407 2568
2408sub size_allocate { 2569sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2410
2411 $self->SUPER::size_allocate ($w, $h);
2412 2571
2413 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416 2576
2417 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2418} 2580}
2419 2581
2420sub text_size { 2582sub text_size {
2421 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2422 2584
2423 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2424 2586
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent); 2588 $layout->set_width ($self->{children}[0]{w} - $indent);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2428 2591
2429 $layout->size 2592 $layout->size
2430} 2593}
2431 2594
… …
2470 2633
2471 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2472 2635
2473 delete $self->{texture}; 2636 delete $self->{texture};
2474 2637
2475 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477 2640
2478 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2479 my $height = 0; 2642 my $height = 0;
2480 2643
… …
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484 2647
2485 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h; 2655 $_->[1] = $h;
2492 } 2656 }
… …
2495 } 2659 }
2496 2660
2497 $self->{height} = $height; 2661 $self->{height} = $height;
2498 2662
2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2500 2664
2501 delete $self->{texture}; 2665 delete $self->{texture};
2502 } 2666 }
2503 2667
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2669 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2507 2671
2508 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2509 2673
2510 my $y0 = $top; 2674 my $y0 = $top;
… …
2524 my $h = $par->[1]; 2688 my $h = $par->[1];
2525 2689
2526 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2529 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2530 2695
2531 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2532 2697
2533 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
… …
2545sub _draw { 2710sub _draw {
2546 my ($self) = @_; 2711 my ($self) = @_;
2547 2712
2548 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2553 2718
2554 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2555 2720
2556} 2721}
… …
2647 $tooltip .= "\n\n" . (ref $widget) . "\n" 2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n" 2814 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}"; 2815 . "visible $widget->{visible}";
2651 } 2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2652 2820
2653 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2654 markup => $tooltip, 2822 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8, 2824 fontsize => 0.8,
… …
2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667 2835
2668 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2669} 2837}
2670 2838
2671sub size_allocate { 2839sub invoke_size_allocate {
2672 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2673 2841
2674 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675} 2843}
2676 2844
2677sub visibility_change { 2845sub invoke_visibility_change {
2678 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2679 2847
2680 return unless $visible; 2848 return unless $visible;
2681 2849
2682 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2684 or return; 2852 or return;
2685 2853
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687 2855
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH; 2857 if $x + $self->{w} > $self->{root}{w};
2690 2858
2691 $self->move_abs ($x, $y); 2859 $self->move_abs ($x, $y);
2692 }); 2860 });
2693} 2861}
2694 2862
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 2952
2785 if ($tex) { 2953 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2791 } 2959 }
2792} 2960}
2793 2961
2794sub DESTROY { 2962sub destroy {
2795 my ($self) = @_; 2963 my ($self) = @_;
2796 2964
2797 $self->{timer}->cancel 2965 $self->{timer}->cancel
2798 if $self->{timer}; 2966 if $self->{timer};
2799 2967
2800 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2801} 2969}
2970
2971#############################################################################
2972
2973package CFClient::UI::Buttonbar;
2974
2975our @ISA = CFClient::UI::HBox::;
2976
2977# TODO: should actualyl wrap buttons and other goodies.
2802 2978
2803############################################################################# 2979#############################################################################
2804 2980
2805package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2806 2982
… …
2818 ); 2994 );
2819 2995
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 2997
2822 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2824 3000
2825 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2826 if (!ref $widget) { 3002 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2828 can_hover => 1, 3004 can_hover => 1,
2829 can_events => 1, 3005 can_events => 1,
2830 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2831 } 3008 }
2832 3009
2833 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2834 3011
2835 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2840 3017
2841# popup given the event (must be a mouse button down event currently) 3018# popup given the event (must be a mouse button down event currently)
2842sub popup { 3019sub popup {
2843 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2844 3021
2845 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2846 3023
2847 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3025 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2850 3027
2851 $self->show; 3028 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3030}
2854 3031
2855sub mouse_motion { 3032sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2857 3034
2858 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3038
3039 0
3040}
3041
2863sub button_up { 3042sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2865 3044
2866 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3046 undef $GRAB;
2868 $self->hide; 3047 $self->hide;
2869 3048
2870 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2872 } 3055 1
2873} 3056}
2874 3057
2875############################################################################# 3058#############################################################################
2876 3059
2877package CFClient::UI::Statusbox; 3060package CFClient::UI::Multiplexer;
2878 3061
2879our @ISA = CFClient::UI::VBox::; 3062our @ISA = CFClient::UI::Container::;
2880 3063
2881sub new { 3064sub new {
2882 my $class = shift; 3065 my $class = shift;
2883 3066
2884 $class->SUPER::new ( 3067 my $self = $class->SUPER::new (
3068 @_,
3069 );
3070
3071 $self->{current} = $self->{children}[0]
3072 if @{ $self->{children} };
3073
3074 $self
3075}
3076
3077sub add {
3078 my ($self, @widgets) = @_;
3079
3080 $self->SUPER::add (@widgets);
3081
3082 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} };
3084}
3085
3086sub set_current_page {
3087 my ($self, $page_or_widget) = @_;
3088
3089 my $widget = ref $page_or_widget
3090 ? $page_or_widget
3091 : $self->{children}[$page_or_widget];
3092
3093 $self->{current} = $widget;
3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3095
3096 $self->emit (page_changed => $self->{current});
3097
3098 $self->realloc;
3099}
3100
3101sub visible_children {
3102 $_[0]{current}
3103}
3104
3105sub size_request {
3106 my ($self) = @_;
3107
3108 $self->{current}->size_request
3109}
3110
3111sub invoke_size_allocate {
3112 my ($self, $w, $h) = @_;
3113
3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3117}
3118
3119sub _draw {
3120 my ($self) = @_;
3121
3122 $self->{current}->draw;
3123}
3124
3125#############################################################################
3126
3127package CFClient::UI::Notebook;
3128
3129our @ISA = CFClient::UI::VBox::;
3130
3131sub new {
3132 my $class = shift;
3133
3134 my $self = $class->SUPER::new (
3135 buttonbar => (new CFClient::UI::Buttonbar),
3136 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3137 # filter => # will be put between multiplexer and $self
3138 @_,
3139 );
3140
3141 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3142 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, $title, $widget, $tooltip) = @_;
3149
3150 Scalar::Util::weaken $self;
3151
3152 $self->{buttonbar}->add (new CFClient::UI::Button
3153 markup => $title,
3154 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) },
3156 );
3157
3158 $self->{multiplexer}->add ($widget);
3159}
3160
3161sub set_current_page {
3162 my ($self, $page) = @_;
3163
3164 $self->{multiplexer}->set_current_page ($page);
3165 $self->emit (page_changed => $self->{multiplexer}{current});
3166}
3167
3168#############################################################################
3169
3170package CFClient::UI::Combobox;
3171
3172use utf8;
3173
3174our @ISA = CFClient::UI::Button::;
3175
3176sub new {
3177 my $class = shift;
3178
3179 my $self = $class->SUPER::new (
3180 options => [], # [value, title, longdesc], ...
3181 value => undef,
3182 @_,
3183 );
3184
3185 $self->_set_value ($self->{value});
3186
3187 $self
3188}
3189
3190sub invoke_button_down {
3191 my ($self, $ev) = @_;
3192
3193 my @menu_items;
3194
3195 for (@{ $self->{options} }) {
3196 my ($value, $title, $tooltip) = @$_;
3197
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 }
3200
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202}
3203
3204sub _set_value {
3205 my ($self, $value) = @_;
3206
3207 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3208 or return;
3209
3210 $self->{value} = $item->[0];
3211 $self->set_markup ("$item->[1] ⇓");
3212 $self->set_tooltip ($item->[2]);
3213}
3214
3215sub set_value {
3216 my ($self, $value) = @_;
3217
3218 return unless $self->{value} ne $value;
3219
3220 $self->_set_value ($value);
3221 $self->emit (changed => $value);
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::Statusbox;
3227
3228our @ISA = CFClient::UI::VBox::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3234 fontsize => 0.8,
2886 @_, 3235 @_,
2887 ) 3236 );
3237
3238 Scalar::Util::weaken (my $this = $self);
3239
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241
3242 $self
2888} 3243}
2889 3244
2890sub reorder { 3245sub reorder {
2891 my ($self) = @_; 3246 my ($self) = @_;
2892 my $NOW = time; 3247 my $NOW = Time::HiRes::time;
3248
3249 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} };
2893 3253
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3256 }
2897 3257
… …
2900 my @items = sort { 3260 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2904 3264
3265 $self->{timer}->interval (1);
3266
2905 my $count = 10 + 1; 3267 my $count = 10 + 1;
2906 for my $item (@items) { 3268 for my $item (@items) {
2907 last unless --$count; 3269 last unless --$count;
2908 3270
2909 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3275 : $item->{text};
2914 3276
… …
2922 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3290 can_events => 1,
2929 can_hover => 1 3291 can_hover => 1
2930 }; 3292 };
3293
3294 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3295 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3296 $label->update;
3297 $label->set_max_size (undef, $label->{req_h} * $diff)
3298 if $diff < 1;
3299 $self->{timer}->interval (1/30);
3300 } else {
3301 $label->{fg}[3] = $item->{fg}[3] || 1;
3302 }
3303
3304 push @widgets, $label;
2931 } 3305 }
2932 3306
2933 $self->clear; 3307 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2935} 3309}
… …
2940 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2942 3316
2943 return unless $text; 3317 return unless $text;
2944 3318
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3320
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3322
2949 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2951 $item->{count}++; 3325 $item->{count}++;
2952 } else { 3326 } else {
2953 $item->{count} = 1; 3327 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2955 } 3329 }
2956 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2957 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2958 delete $item->{label}; 3332 delete $item->{label};
2959 } else { 3333 } else {
2960 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2961 id => ++$self->{id}, 3335 id => ++$self->{id},
… …
2980 3354
2981 $self->reorder; 3355 $self->reorder;
2982 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
2983} 3357}
2984 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
2985############################################################################# 3367#############################################################################
2986 3368
2987package CFClient::UI::Inventory; 3369package CFClient::UI::Inventory;
2988 3370
2989our @ISA = CFClient::UI::ScrolledWindow::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
2990 3372
2991sub new { 3373sub new {
2992 my $class = shift; 3374 my $class = shift;
2993 3375
2994 my $self = $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3378 @_,
2997 ); 3379 );
2998 3380
2999 $self 3381 $self
3000} 3382}
3001 3383
3002sub set_items { 3384sub set_items {
3003 my ($self, $items) = @_; 3385 my ($self, $items) = @_;
3004 3386
3005 $self->{scrolled}->clear; 3387 $self->{child}->clear;
3006 return unless $items; 3388 return unless $items;
3007 3389
3008 my @items = sort { 3390 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3391 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3392 or ($a->{name} cmp $b->{name})
… …
3014 3396
3015 my $row = 0; 3397 my $row = 0;
3016 for my $item (@items) { 3398 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3399 CFClient::Item::update_widgets $item;
3018 3400
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3401 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3402 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3403 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3404
3023 $row++; 3405 $row++;
3024 } 3406 }
3025} 3407}
3026 3408
… …
3124 $rec = $::CONN->stop_record if $::CONN; 3506 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY'; 3507 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec); 3508 $self->set_command_list ($rec);
3127} 3509}
3128 3510
3129# if $commit is true, the binding will be set after the user entered a key combo 3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3130sub ask_for_bind { 3517sub ask_for_bind {
3131 my ($self, $commit) = @_; 3518 my ($self, $commit, $end_cb) = @_;
3132 3519
3133 CFClient::Binder::open_binding_dialog (sub { 3520 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_; 3521 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets; 3523 $self->update_binding_widgets;
3137 $self->commit if $commit; 3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3138 }); 3526 });
3139} 3527}
3140 3528
3141# $mod and $sym are the modifiers and key symbol 3529# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands) 3530# $cmds is a array ref of strings (the commands)
… …
3160} 3548}
3161 3549
3162# this is a shortcut method that asks for a binding 3550# this is a shortcut method that asks for a binding
3163# and then just binds it. 3551# and then just binds it.
3164sub do_quick_binding { 3552sub do_quick_binding {
3165 my ($self, $cmds) = @_; 3553 my ($self, $cmds, $end_cb) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub { 3554 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 }); 3556 });
3169 $self->ask_for_bind (1); 3557 $self->ask_for_bind (1, $end_cb);
3170} 3558}
3171 3559
3172sub update_binding_widgets { 3560sub update_binding_widgets {
3173 my ($self) = @_; 3561 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding; 3562 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3218 3606
3219############################################################################# 3607#############################################################################
3220 3608
3221package CFClient::UI::SpellList; 3609package CFClient::UI::SpellList;
3222 3610
3223our @ISA = CFClient::UI::FancyFrame::; 3611our @ISA = CFClient::UI::Table::;
3224 3612
3225sub new { 3613sub new {
3226 my $class = shift; 3614 my $class = shift;
3227 3615
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3616 my $self = $class->SUPER::new (
3229 3617 binding => [],
3230 $self->add (new CFClient::UI::ScrolledWindow 3618 commands => [],
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3619 @_,
3232 3620 )
3233 $self;
3234} 3621}
3235 3622
3236# XXX: Do sorting? Argl... 3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3237sub add_spell { 3708sub add_spell {
3238 my ($self, $spell) = @_; 3709 my ($self, $spell) = @_;
3710
3239 $self->{spells}->{$spell->{name}} = $spell; 3711 $self->{spell}->{$spell->{name}} = $spell;
3240 3712 $self->rebuild_spell_list;
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268} 3713}
3269 3714
3270sub remove_spell { 3715sub remove_spell {
3271 my ($self, $spell) = @_; 3716 my ($self, $spell) = @_;
3717
3272 delete $self->{spells}->{$spell->{name}}; 3718 delete $self->{spell}->{$spell->{name}};
3273 $self->rebuild_spell_list; 3719 $self->rebuild_spell_list;
3274} 3720}
3275 3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3276############################################################################# 3729#############################################################################
3277 3730
3278package CFClient::UI::Root; 3731package CFClient::UI::Root;
3279 3732
3280our @ISA = CFClient::UI::Container::; 3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
3281 3736
3282use CFClient::OpenGL; 3737use CFClient::OpenGL;
3283 3738
3284sub new { 3739sub new {
3285 my $class = shift; 3740 my $class = shift;
… …
3312 $coord = $max - $size if $coord > $max - $size; 3767 $coord = $max - $size if $coord > $max - $size;
3313 3768
3314 int $coord + 0.5 3769 int $coord + 0.5
3315} 3770}
3316 3771
3317sub size_allocate { 3772sub invoke_size_allocate {
3318 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3319 3774
3320 for my $child ($self->children) { 3775 for my $child ($self->children) {
3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3322 3777
… …
3326 $X = _to_pixel $X, $W, $self->{w}; 3781 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3328 3783
3329 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3330 } 3785 }
3786
3787 1
3331} 3788}
3332 3789
3333sub coord2local { 3790sub coord2local {
3334 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3335 3792
… …
3420 3877
3421 delete $queue{$widget+0}; 3878 delete $queue{$widget+0};
3422 3879
3423 my ($w, $h) = $widget->size_request; 3880 my ($w, $h) = $widget->size_request;
3424 3881
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3882 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3883 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3887
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3888 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3889 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3890
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3891 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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