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.266 by root, Thu Jun 1 03:42:58 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;
453}
454 462
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 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
478}
460 479
461sub find_widget { 480sub find_widget {
462 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
463 482
464 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
473sub set_parent { 492sub set_parent {
474 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
475 494
476 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
478}
479
480sub connect {
481 my ($self, $signal, $cb) = @_;
482
483 push @{ $self->{signal_cb}{$signal} }, $cb;
484}
485
486sub _emit {
487 my ($self, $signal, @args) = @_;
488
489 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
490}
491
492sub emit {
493 my ($self, $signal, @args) = @_;
494
495 $self->_emit ($signal, @args)
496 || $self->$signal (@args);
497}
498
499sub visibility_change {
500 #my ($self, $visible) = @_;
501} 497}
502 498
503sub realloc { 499sub realloc {
504 my ($self) = @_; 500 my ($self) = @_;
505 501
… …
526 522
527 $self->realloc; 523 $self->realloc;
528 $self->update; 524 $self->update;
529} 525}
530 526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530
531sub draw { 531sub draw {
532 my ($self) = @_; 532 my ($self) = @_;
533 533
534 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
535 545
536 glPushMatrix; 546 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw;
539 glPopMatrix;
540 548
541 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
542 my ($x, $y) = @$self{qw(x y)};
543
544 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
545 glEnable GL_BLEND; 551 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glBegin GL_QUADS; 553 glBegin GL_QUADS;
548 glVertex $x , $y; 554 glVertex 0 , 0;
549 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
550 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
551 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
552 glEnd; 558 glEnd;
553 glDisable GL_BLEND; 559 glDisable GL_BLEND;
554 } 560 }
555 561
556 if ($ENV{CFPLUS_DEBUG} & 1) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
557 glPushMatrix; 563 glPushMatrix;
558 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
560 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
561 glVertex 0 , 0; 567 glVertex 0 , 0;
562 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
563 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
564 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
565 glEnd; 571 glEnd;
566 glPopMatrix; 572 glPopMatrix;
567 #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;
568 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
569} 578}
570 579
571sub _draw { 580sub _draw {
572 my ($self) = @_; 581 my ($self) = @_;
573 582
… …
576 585
577sub DESTROY { 586sub DESTROY {
578 my ($self) = @_; 587 my ($self) = @_;
579 588
580 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
581 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
582} 593}
583 594
584############################################################################# 595#############################################################################
585 596
586package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
611 622
612 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
613 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
614 625
615 glEnable GL_BLEND; 626 glEnable GL_BLEND;
616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617 glColor @$color; 628 glColor_premultiply @$color;
618 629
619 glBegin GL_QUADS; 630 glBegin GL_QUADS;
620 glVertex 0 , 0; 631 glVertex 0 , 0;
621 glVertex 0 , $h; 632 glVertex 0 , $h;
622 glVertex $w, $h; 633 glVertex $w, $h;
… …
653our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
654 665
655sub new { 666sub new {
656 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
657 668
658 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
659 670
660 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
661 children => [], 672 children => [],
662 can_events => 0, 673 can_events => 0,
663 %arg, 674 %arg,
664 ); 675 );
676
665 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
666 679
667 $self 680 $self
668} 681}
669 682
670sub add { 683sub add {
… …
718 $x -= $self->{x}; 731 $x -= $self->{x};
719 $y -= $self->{y}; 732 $y -= $self->{y};
720 733
721 my $res; 734 my $res;
722 735
723 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
725 and return $res; 738 and return $res;
726 } 739 }
727 740
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
749} 762}
750 763
751sub add { 764sub add {
752 my ($self, $child) = @_; 765 my ($self, $child) = @_;
753 766
754 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
757} 769}
758 770
759sub remove { 771sub remove {
760 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
769 781
770sub size_request { 782sub size_request {
771 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
772} 784}
773 785
774sub size_allocate { 786sub invoke_size_allocate {
775 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
776 788
777 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
778} 792}
779 793
780############################################################################# 794#############################################################################
795
796# back-buffered drawing area
781 797
782package CFClient::UI::Window; 798package CFClient::UI::Window;
783 799
784our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
785 801
… …
796 812
797 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
798 $self->SUPER::update; 814 $self->SUPER::update;
799} 815}
800 816
801sub size_allocate { 817sub invoke_size_allocate {
802 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
803 819
804 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
806} 823}
807 824
808sub _render { 825sub _render {
826 my ($self) = @_;
827
809 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
810} 829}
811 830
812sub render_child { 831sub render_child {
813 my ($self) = @_; 832 my ($self) = @_;
814 833
815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
816 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
818 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
819 $self->_render; 845 $self->_render;
820 }; 846 };
821} 847}
822 848
823sub _draw { 849sub _draw {
824 my ($self) = @_; 850 my ($self) = @_;
825 851
826 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
827 853
828 my $tex = $self->{texture} 854 my $tex = $self->{texture}
829 or return; 855 or return;
830 856
831 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
834 860
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836 862
837 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
838} 864}
… …
862 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
863 889
864 ($w, $h) 890 ($w, $h)
865} 891}
866 892
867sub size_allocate { 893sub invoke_size_allocate {
868 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
869 895
870 my $child = $self->child; 896 my $child = $self->child;
871 897
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874 900
875 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
876 $self->update; 902 $self->update;
903
904 1
877} 905}
878 906
879sub set_offset { 907sub set_offset {
880 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
881 909
… …
914} 942}
915 943
916sub _render { 944sub _render {
917 my ($self) = @_; 945 my ($self) = @_;
918 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 951
921 $self->SUPER::_render; 952 $self->SUPER::_render;
922} 953}
923 954
… …
926package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
927 958
928our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
929 960
930sub new { 961sub new {
931 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
932 965
933 my $self; 966 my $self;
934 967
935 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
936 vertical => 1, 969 vertical => 1,
… …
941 ; 974 ;
942 975
943 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
945 slider => $slider, 978 slider => $slider,
946 @_, 979 %arg,
947 ); 980 );
948 981
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
952 984
953 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
954} 992}
955 993
956sub update { 994sub update {
957 my ($self) = @_; 995 my ($self) = @_;
958 996
… …
961 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
962 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
963 $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]);
964} 1002}
965 1003
966sub size_allocate { 1004sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
968
969 $self->SUPER::size_allocate ($w, $h);
970 1006
971 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
972 $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)
973} 1011}
974 1012
975#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll 1014# update viewport offset on scroll
977 1015
… …
997 1035
998 if ($self->{bg}) { 1036 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
1000 1038
1001 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
1004 1042
1005 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1044 glVertex 0 , 0;
1007 glVertex 0 , $h; 1045 glVertex 0 , $h;
1008 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1030my @border = 1068my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032 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);
1033 1071
1034sub new { 1072sub new {
1035 my $class = shift; 1073 my ($class, %arg) = @_;
1036 1074
1037 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1078 border => 0.6,
1041 can_events => 1, 1079 can_events => 1,
1042 min_w => 16, 1080 min_w => 16,
1043 min_h => 16, 1081 min_h => 16,
1044 @_ 1082 %arg,
1045 ); 1083 );
1046 1084
1047 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1048 align => 0, 1086 align => 0,
1049 valign => 1, 1087 valign => 1,
1050 text => $self->{title}, 1088 text => $self->{title},
1051 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 }
1052 1100
1053 $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};
1054} 1110}
1055 1111
1056sub border { 1112sub border {
1057 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1058} 1114}
1059 1115
1060sub size_request { 1116sub size_request {
1061 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};
1062 1124
1063 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1064 1126
1065 ( 1127 (
1066 $w + $self->border * 2, 1128 $w + $self->border * 2,
1067 $h + $self->border * 2, 1129 $h + $self->border * 2,
1068 ) 1130 )
1069} 1131}
1070 1132
1071sub size_allocate { 1133sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1073 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
1074 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1076 1146
1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078 if $self->{title};
1079
1080 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1081}
1082 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1083sub button_down { 1155sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1085 1157
1086 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1159 my $border = $self->border;
1088 1160
… …
1104 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1105 1177
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1182 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1183 };
1112 1184
1113 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1119 1191
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1193
1122 $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});
1123 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1124 } 1202 1
1125} 1203}
1126 1204
1127sub button_up { 1205sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1129 1207
1130 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1131} 1209}
1132 1210
1133sub mouse_motion { 1211sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1135 1213
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1137} 1217}
1138 1218
1139sub _draw { 1219sub _draw {
1140 my ($self) = @_; 1220 my ($self) = @_;
1141 1221
1222 my $child = $self->{children}[0];
1223
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1226
1145 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1229
1148 my $border = $self->border; 1230 my $border = $self->border;
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1246 }
1165 1247
1166 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1167 1249
1168 $self->{title}->draw if $self->{title};
1169
1170 $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};
1171} 1261}
1172 1262
1173############################################################################# 1263#############################################################################
1174 1264
1175package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1198 1288
1199 $child->set_parent ($self); 1289 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1201 1291
1202 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1203} 1299}
1204 1300
1205# 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?
1206sub clear { 1302sub clear {
1207 my ($self) = @_; 1303 my ($self) = @_;
… …
1248 (sum @$ws), 1344 (sum @$ws),
1249 (sum @$hs), 1345 (sum @$hs),
1250 ) 1346 )
1251} 1347}
1252 1348
1253sub size_allocate { 1349sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1255 1351
1256 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1257 1353
1258 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1290 } 1386 }
1291 1387
1292 $y += $row_h; 1388 $y += $row_h;
1293 } 1389 }
1294 1390
1391 1
1295} 1392}
1296 1393
1297sub find_widget { 1394sub find_widget {
1298 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1299 1396
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1435 )
1339} 1436}
1340 1437
1341sub size_allocate { 1438sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1343 1440
1344 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1442 my $children = $self->{children};
1346 1443
… …
1468 1565
1469 delete $self->{texture}; 1566 delete $self->{texture};
1470 $self->SUPER::update; 1567 $self->SUPER::update;
1471} 1568}
1472 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1473sub set_text { 1577sub set_text {
1474 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1475 1579
1476 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1478 1582
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1481 1585
1586 delete $self->{size_req};
1482 $self->realloc; 1587 $self->realloc;
1483 $self->update; 1588 $self->update;
1484} 1589}
1485 1590
1486sub set_markup { 1591sub set_markup {
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1598
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1496 1601
1602 delete $self->{size_req};
1497 $self->realloc; 1603 $self->realloc;
1498 $self->update; 1604 $self->update;
1499} 1605}
1500 1606
1501sub size_request { 1607sub size_request {
1502 my ($self) = @_; 1608 my ($self) = @_;
1503 1609
1610 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1616
1510 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1511 1618
1512 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1622
1516 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1517 1624
1518 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1520 } 1630 };
1521 1631
1522 ($w, $h) 1632 @{ $self->{size_req} }
1523} 1633}
1524 1634
1525sub size_allocate { 1635sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1527 1639
1528 delete $self->{texture} 1640 delete $self->{texture}
1529 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
1530} 1644}
1531 1645
1532sub set_fontsize { 1646sub set_fontsize {
1533 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1534 1648
1535 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1536 delete $self->{texture}; 1650 delete $self->{texture};
1537 1651
1538 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1539} 1661}
1540 1662
1541sub _draw { 1663sub _draw {
1542 my ($self) = @_; 1664 my ($self) = @_;
1543 1665
… …
1549 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1675
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1555 1678
1679 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1559 1683
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1565 }; 1687 };
1566 1688
1567 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1568 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};
1569 1693
1570 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1571 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1573 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1575 } 1701 }
1576 1702
1577 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1578} 1704}
1579 1705
… …
1596 can_hover => 1, 1722 can_hover => 1,
1597 can_focus => 1, 1723 can_focus => 1,
1598 valign => 0, 1724 valign => 0,
1599 can_events => 1, 1725 can_events => 1,
1600 #text => ... 1726 #text => ...
1727 #hidden => "*",
1601 @_ 1728 @_
1602 ) 1729 )
1603} 1730}
1604 1731
1605sub _set_text { 1732sub _set_text {
… …
1607 1734
1608 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1609 1736
1610 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1611 1738
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1740 $self->{text} = $text;
1616 1741
1617 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1619 1745
1620 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1621} 1750}
1622 1751
1623sub set_text { 1752sub set_text {
1624 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1625 1754
1626 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 1756 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 1757}
1631 1758
1632sub get_text { 1759sub get_text {
1633 $_[0]{text} 1760 $_[0]{text}
1634} 1761}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1640 1767
1641 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1642} 1769}
1643 1770
1644sub key_down { 1771sub invoke_key_down {
1645 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1646 1773
1647 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1661 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1662 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1793 $self->emit ('escape');
1667 } elsif ($uni) { 1794 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1669 } 1798 }
1670 1799
1671 $self->_set_text ($text); 1800 $self->_set_text ($text);
1672 1801
1673 $self->realloc; 1802 $self->realloc;
1674}
1675 1803
1804 1
1805}
1806
1676sub focus_in { 1807sub invoke_focus_in {
1677 my ($self) = @_; 1808 my ($self) = @_;
1678 1809
1679 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1680 1811
1681 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1682} 1813}
1683 1814
1684sub button_down { 1815sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1686 1817
1687 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 1819
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 1821
1691 # byte-index to char-index 1822 # byte-index to char-index
1692 my $text = $self->{text}; 1823 my $text = $self->{text};
1693 utf8::encode $text; 1824 utf8::encode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1695 1826
1696 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1697 $self->update; 1828 $self->update;
1829
1830 1
1698} 1831}
1699 1832
1700sub mouse_motion { 1833sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1702# 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
1703} 1838}
1704 1839
1705sub _draw { 1840sub _draw {
1706 my ($self) = @_; 1841 my ($self) = @_;
1707 1842
1708 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1709 1844
1710 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1713 } else { 1848 } else {
1714 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1715 } 1850 }
1716 1851
1717 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1720 glVertex 0 , 0; 1855 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1748 1883
1749our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1750 1885
1751use CFClient::OpenGL; 1886use CFClient::OpenGL;
1752 1887
1753sub key_down { 1888sub invoke_key_down {
1754 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1755 1890
1756 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1757 1892
1758 if ($sym == 13) { 1893 if ($sym == 13) {
1759 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1761 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1764 $self->update; 1899 $self->update;
1765 1900
1766 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1784 } else { 1919 } else {
1785 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1786 } 1921 }
1787 1922
1788 } else { 1923 } else {
1789 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1790 } 1927 1
1791
1792} 1928}
1793 1929
1794############################################################################# 1930#############################################################################
1795 1931
1796package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1817 can_events => 1, 1953 can_events => 1,
1818 @_ 1954 @_
1819 ) 1955 )
1820} 1956}
1821 1957
1822sub activate { }
1823
1824sub button_up { 1958sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1826 1960
1827 $self->emit ("activate") 1961 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
1964
1965 1
1830} 1966}
1831 1967
1832sub _draw { 1968sub _draw {
1833 my ($self) = @_; 1969 my ($self) = @_;
1834 1970
1835 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 1972
1841 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1844 1976
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 1978
1847 glDisable GL_TEXTURE_2D; 1979 glDisable GL_TEXTURE_2D;
1848 1980
1849 $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
1850} 2018}
1851 2019
1852############################################################################# 2020#############################################################################
1853 2021
1854package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
… …
1881 my ($self) = @_; 2049 my ($self) = @_;
1882 2050
1883 (6) x 2 2051 (6) x 2
1884} 2052}
1885 2053
1886sub button_down { 2054sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1888 2056
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1892 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1893 } 2065 1
1894} 2066}
1895 2067
1896sub _draw { 2068sub _draw {
1897 my ($self) = @_; 2069 my ($self) = @_;
1898 2070
… …
2065 2237
2066 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
2068 2240
2069 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2070 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;
2071 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2246
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
2189 $self->update; 2362 $self->update;
2190 2363
2191 $self 2364 $self
2192} 2365}
2193 2366
2194sub changed { }
2195
2196sub set_range { 2367sub set_range {
2197 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2198 2369
2199 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2200 2371
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2203} 2376}
2204 2377
2205sub set_value { 2378sub set_value {
2206 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2207 2380
… …
2218 if $unit; 2391 if $unit;
2219 2392
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2394
2222 if ($value != $old_value) { 2395 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2224 $self->update; 2397 $self->update;
2225 } 2398 }
2226} 2399}
2227 2400
2228sub size_request { 2401sub size_request {
2229 my ($self) = @_; 2402 my ($self) = @_;
2230 2403
2231 ($self->{req_w}, $self->{req_h}) 2404 ($self->{req_w}, $self->{req_h})
2232} 2405}
2233 2406
2234sub button_down { 2407sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2236 2409
2237 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2411
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2413
2241 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2242} 2415}
2243 2416
2244sub mouse_motion { 2417sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2246 2419
2247 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2422
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2423 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2424
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2425 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2426
2254 $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
2255 } 2432 1
2256} 2433}
2257 2434
2258sub update { 2435sub update {
2259 my ($self) = @_; 2436 my ($self) = @_;
2260 2437
2261 $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}) {
2262 $self->set_value ($self->{range}[0]); 2446 $self->set_value ($self->{range}[0]);
2263 2447
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2449 my $range = ($hi - $page - $lo) || 1e-100;
2266 2450
… …
2272 $value = ($value - $lo) / $range; 2456 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2457 $value = $value * $self->{scale} + $self->{offset};
2274 2458
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2460 $self->{knob_w} = $knob_w;
2277 }); 2461 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2462
2285 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2286 2464
2287 glScale $self->{w}, $self->{h}; 2465 glScale $self->{w}, $self->{h};
2288 2466
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2351 2529
2352############################################################################# 2530#############################################################################
2353 2531
2354package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2355 2533
2356our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2357 2535
2358use CFClient::OpenGL; 2536use CFClient::OpenGL;
2359 2537
… …
2361 my $class = shift; 2539 my $class = shift;
2362 2540
2363 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2364 fontsize => 1, 2542 fontsize => 1,
2365 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2366 #font => default_font 2545 #font => default_font
2367 @_, 2546 @_,
2368 2547
2369 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2370 par => [], 2549 par => [],
… …
2385 2564
2386 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2566 $self->reflow;
2388} 2567}
2389 2568
2390sub size_allocate { 2569sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2392
2393 $self->SUPER::size_allocate ($w, $h);
2394 2571
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $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});
2398 2576
2399 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2400} 2580}
2401 2581
2402sub text_size { 2582sub text_size {
2403 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2404 2584
2405 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2406 2586
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $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});
2409 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2410 2591
2411 $layout->size 2592 $layout->size
2412} 2593}
2413 2594
… …
2452 2633
2453 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2454 2635
2455 delete $self->{texture}; 2636 delete $self->{texture};
2456 2637
2457 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2640
2460 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2642 my $height = 0;
2462 2643
… …
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2647
2467 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2655 $_->[1] = $h;
2474 } 2656 }
… …
2477 } 2659 }
2478 2660
2479 $self->{height} = $height; 2661 $self->{height} = $height;
2480 2662
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2482 2664
2483 delete $self->{texture}; 2665 delete $self->{texture};
2484 } 2666 }
2485 2667
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2669 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2489 2671
2490 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2491 2673
2492 my $y0 = $top; 2674 my $y0 = $top;
… …
2506 my $h = $par->[1]; 2688 my $h = $par->[1];
2507 2689
2508 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2512 2695
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2697
2515 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
… …
2527sub _draw { 2710sub _draw {
2528 my ($self) = @_; 2711 my ($self) = @_;
2529 2712
2530 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2533 $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});
2534 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2535 2718
2536 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2537 2720
2538} 2721}
… …
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 2814 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 2815 . "visible $widget->{visible}";
2633 } 2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2634 2820
2635 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2636 markup => $tooltip, 2822 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 2824 fontsize => 0.8,
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 2835
2650 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2651} 2837}
2652 2838
2653sub size_allocate { 2839sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2655 2841
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 2843}
2658 2844
2659sub visibility_change { 2845sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2661 2847
2662 return unless $visible; 2848 return unless $visible;
2663 2849
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2666 or return; 2852 or return;
2667 2853
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 2855
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 2857 if $x + $self->{w} > $self->{root}{w};
2672 2858
2673 $self->move_abs ($x, $y); 2859 $self->move_abs ($x, $y);
2674 }); 2860 });
2675} 2861}
2676 2862
… …
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2766 2952
2767 if ($tex) { 2953 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2773 } 2959 }
2774} 2960}
2775 2961
2776sub DESTROY { 2962sub destroy {
2777 my ($self) = @_; 2963 my ($self) = @_;
2778 2964
2779 $self->{timer}->cancel 2965 $self->{timer}->cancel
2780 if $self->{timer}; 2966 if $self->{timer};
2781 2967
2782 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2783} 2969}
2970
2971#############################################################################
2972
2973package CFClient::UI::Buttonbar;
2974
2975our @ISA = CFClient::UI::HBox::;
2976
2977# TODO: should actualyl wrap buttons and other goodies.
2784 2978
2785############################################################################# 2979#############################################################################
2786 2980
2787package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2788 2982
… …
2800 ); 2994 );
2801 2995
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2803 2997
2804 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2806 3000
2807 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2808 if (!ref $widget) { 3002 if (!ref $widget) {
2809 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2810 can_hover => 1, 3004 can_hover => 1,
2811 can_events => 1, 3005 can_events => 1,
2812 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2813 } 3008 }
2814 3009
2815 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2816 3011
2817 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2822 3017
2823# 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)
2824sub popup { 3019sub popup {
2825 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2826 3021
2827 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2828 3023
2829 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3025 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2832 3027
2833 $self->show; 3028 $self->show;
2834 $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);
2835} 3030}
2836 3031
2837sub mouse_motion { 3032sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2839 3034
2840 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3038
3039 0
3040}
3041
2845sub button_up { 3042sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2847 3044
2848 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3046 undef $GRAB;
2850 $self->hide; 3047 $self->hide;
2851 3048
2852 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2854 } 3055 1
2855} 3056}
2856 3057
2857############################################################################# 3058#############################################################################
2858 3059
2859package CFClient::UI::Statusbox; 3060package CFClient::UI::Multiplexer;
2860 3061
2861our @ISA = CFClient::UI::VBox::; 3062our @ISA = CFClient::UI::Container::;
2862 3063
2863sub new { 3064sub new {
2864 my $class = shift; 3065 my $class = shift;
2865 3066
2866 $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 (
2867 fontsize => 0.8, 3234 fontsize => 0.8,
2868 @_, 3235 @_,
2869 ) 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
2870} 3243}
2871 3244
2872sub reorder { 3245sub reorder {
2873 my ($self) = @_; 3246 my ($self) = @_;
2874 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} };
2875 3253
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3256 }
2879 3257
… …
2882 my @items = sort { 3260 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2886 3264
3265 $self->{timer}->interval (1);
3266
2887 my $count = 10 + 1; 3267 my $count = 10 + 1;
2888 for my $item (@items) { 3268 for my $item (@items) {
2889 last unless --$count; 3269 last unless --$count;
2890 3270
2891 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3275 : $item->{text};
2896 3276
… …
2904 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3290 can_events => 1,
2911 can_hover => 1 3291 can_hover => 1
2912 }; 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;
2913 } 3305 }
2914 3306
2915 $self->clear; 3307 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2917} 3309}
… …
2922 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2924 3316
2925 return unless $text; 3317 return unless $text;
2926 3318
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3320
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3322
2931 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2933 $item->{count}++; 3325 $item->{count}++;
2934 } else { 3326 } else {
2935 $item->{count} = 1; 3327 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2937 } 3329 }
2938 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3332 delete $item->{label};
2941 } else { 3333 } else {
2942 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3335 id => ++$self->{id},
… …
2962 3354
2963 $self->reorder; 3355 $self->reorder;
2964 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
2965} 3357}
2966 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
2967############################################################################# 3367#############################################################################
2968 3368
2969package CFClient::UI::Inventory; 3369package CFClient::UI::Inventory;
2970 3370
2971our @ISA = CFClient::UI::ScrolledWindow::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
2972 3372
2973sub new { 3373sub new {
2974 my $class = shift; 3374 my $class = shift;
2975 3375
2976 my $self = $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_, 3378 @_,
2979 ); 3379 );
2980 3380
2981 $self 3381 $self
2982} 3382}
2983 3383
2984sub set_items { 3384sub set_items {
2985 my ($self, $items) = @_; 3385 my ($self, $items) = @_;
2986 3386
2987 $self->{scrolled}->clear; 3387 $self->{child}->clear;
2988 return unless $items; 3388 return unless $items;
2989 3389
2990 my @items = sort { 3390 my @items = sort {
2991 ($a->{type} <=> $b->{type}) 3391 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name}) 3392 or ($a->{name} cmp $b->{name})
… …
2996 3396
2997 my $row = 0; 3397 my $row = 0;
2998 for my $item (@items) { 3398 for my $item (@items) {
2999 CFClient::Item::update_widgets $item; 3399 CFClient::Item::update_widgets $item;
3000 3400
3001 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3401 $self->{child}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3402 $self->{child}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3403 $self->{child}->add (2, $row, $item->{weight_widget});
3004 3404
3005 $row++; 3405 $row++;
3006 } 3406 }
3007} 3407}
3008 3408
… …
3106 $rec = $::CONN->stop_record if $::CONN; 3506 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY'; 3507 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec); 3508 $self->set_command_list ($rec);
3109} 3509}
3110 3510
3111# 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
3112sub ask_for_bind { 3517sub ask_for_bind {
3113 my ($self, $commit) = @_; 3518 my ($self, $commit, $end_cb) = @_;
3114 3519
3115 CFClient::Binder::open_binding_dialog (sub { 3520 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_; 3521 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets; 3523 $self->update_binding_widgets;
3119 $self->commit if $commit; 3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3120 }); 3526 });
3121} 3527}
3122 3528
3123# $mod and $sym are the modifiers and key symbol 3529# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands) 3530# $cmds is a array ref of strings (the commands)
… …
3142} 3548}
3143 3549
3144# this is a shortcut method that asks for a binding 3550# this is a shortcut method that asks for a binding
3145# and then just binds it. 3551# and then just binds it.
3146sub do_quick_binding { 3552sub do_quick_binding {
3147 my ($self, $cmds) = @_; 3553 my ($self, $cmds, $end_cb) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub { 3554 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 }); 3556 });
3151 $self->ask_for_bind (1); 3557 $self->ask_for_bind (1, $end_cb);
3152} 3558}
3153 3559
3154sub update_binding_widgets { 3560sub update_binding_widgets {
3155 my ($self) = @_; 3561 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding; 3562 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3200 3606
3201############################################################################# 3607#############################################################################
3202 3608
3203package CFClient::UI::SpellList; 3609package CFClient::UI::SpellList;
3204 3610
3205our @ISA = CFClient::UI::FancyFrame::; 3611our @ISA = CFClient::UI::Table::;
3206 3612
3207sub new { 3613sub new {
3208 my $class = shift; 3614 my $class = shift;
3209 3615
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3616 my $self = $class->SUPER::new (
3211 3617 binding => [],
3212 $self->add (new CFClient::UI::ScrolledWindow 3618 commands => [],
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3619 @_,
3214 3620 )
3215 $self;
3216} 3621}
3217 3622
3218# 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
3219sub add_spell { 3708sub add_spell {
3220 my ($self, $spell) = @_; 3709 my ($self, $spell) = @_;
3710
3221 $self->{spells}->{$spell->{name}} = $spell; 3711 $self->{spell}->{$spell->{name}} = $spell;
3222 3712 $self->rebuild_spell_list;
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250} 3713}
3251 3714
3252sub remove_spell { 3715sub remove_spell {
3253 my ($self, $spell) = @_; 3716 my ($self, $spell) = @_;
3717
3254 delete $self->{spells}->{$spell->{name}}; 3718 delete $self->{spell}->{$spell->{name}};
3255 $self->rebuild_spell_list; 3719 $self->rebuild_spell_list;
3256} 3720}
3257 3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3258############################################################################# 3729#############################################################################
3259 3730
3260package CFClient::UI::Root; 3731package CFClient::UI::Root;
3261 3732
3262our @ISA = CFClient::UI::Container::; 3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
3263 3736
3264use CFClient::OpenGL; 3737use CFClient::OpenGL;
3265 3738
3266sub new { 3739sub new {
3267 my $class = shift; 3740 my $class = shift;
… …
3294 $coord = $max - $size if $coord > $max - $size; 3767 $coord = $max - $size if $coord > $max - $size;
3295 3768
3296 int $coord + 0.5 3769 int $coord + 0.5
3297} 3770}
3298 3771
3299sub size_allocate { 3772sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3301 3774
3302 for my $child ($self->children) { 3775 for my $child ($self->children) {
3303 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)};
3304 3777
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 3781 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3310 3783
3311 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3312 } 3785 }
3786
3787 1
3313} 3788}
3314 3789
3315sub coord2local { 3790sub coord2local {
3316 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3317 3792
… …
3402 3877
3403 delete $queue{$widget+0}; 3878 delete $queue{$widget+0};
3404 3879
3405 my ($w, $h) = $widget->size_request; 3880 my ($w, $h) = $widget->size_request;
3406 3881
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3882 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $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};
3409 3887
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 3888 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 3889 $h = $widget->{force_h} if exists $widget->{force_h};
3412 3890
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3891 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3471 glLoadIdentity; 3949 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3952 glLoadIdentity;
3475 3953
3954 {
3955 package CFClient::UI::Base;
3956
3957 ($draw_x, $draw_y, $draw_w, $draw_h) =
3958 (0, 0, $self->{w}, $self->{h});
3959 }
3960
3476 $self->_draw; 3961 $self->_draw;
3477} 3962}
3478 3963
3479############################################################################# 3964#############################################################################
3480 3965

Diff Legend

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