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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
193 reconfigure_widgets; 207 reconfigure_widgets;
194} 208}
195 209
196############################################################################# 210#############################################################################
197 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
198package CFClient::UI::Base; 220package CFPlus::UI::Base;
199 221
200use strict; 222use strict;
201 223
202use CFClient::OpenGL; 224use CFPlus::OpenGL;
203 225
204sub new { 226sub new {
205 my $class = shift; 227 my $class = shift;
206 228
207 my $self = bless { 229 my $self = bless {
… …
212 h => undef, 234 h => undef,
213 can_events => 1, 235 can_events => 1,
214 @_ 236 @_
215 }, $class; 237 }, $class;
216 238
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 240
219 for (keys %$self) { 241 for (keys %$self) {
220 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
222 } 244 }
223 } 245 }
224 246
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 252
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 255
234 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
247sub show { 269sub show {
248 my ($self) = @_; 270 my ($self) = @_;
249 271
250 return if $self->{parent}; 272 return if $self->{parent};
251 273
252 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
253} 275}
254 276
255sub set_visible { 277sub set_visible {
256 my ($self) = @_; 278 my ($self) = @_;
257 279
… …
278 delete $self->{root}; 300 delete $self->{root};
279 301
280 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
282 304
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
285 307
286 $self->focus_out; 308 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
289} 310}
290 311
291sub set_visibility { 312sub set_visibility {
292 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
336sub size_request { 357sub size_request {
337 require Carp; 358 require Carp;
338 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
339} 360}
340 361
362sub baseline_shift {
363 0
364}
365
341sub configure { 366sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
343 368
344 if ($self->{aspect}) { 369 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
346 371
347 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 374
350 # use alignment to adjust x, y 375 # use alignment to adjust x, y
351 376
352 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
367 392
368 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
369 } 394 }
370} 395}
371 396
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 397sub children {
377 # nop 398 # nop
378} 399}
379 400
380sub visible_children { 401sub visible_children {
… …
398 419
399 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
400 421
401 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
402 423
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 427 }
407} 428}
408 429
409# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
410sub coord2local { 431sub coord2local {
411 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
412 433
434 Carp::confess unless $self->{parent};#d#
435
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 437}
415 438
416# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
417sub coord2global { 440sub coord2global {
418 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
419 442
443 Carp::confess unless $self->{parent};#d#
444
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 446}
422 447
423sub focus_in { 448sub invoke_focus_in {
424 my ($self) = @_; 449 my ($self) = @_;
425 450
426 return if $FOCUS == $self; 451 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
428 453
429 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
430 455
431 $self->_emit (focus_in => $focus); 456 $self->update;
432 457
433 $focus->update if $focus; 458 0
434 $FOCUS->update;
435} 459}
436 460
437sub focus_out { 461sub invoke_focus_out {
438 my ($self) = @_; 462 my ($self) = @_;
439 463
440 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
441 465
442 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
443 467
444 $self->_emit (focus_out => $focus); 468 $self->update;
445 469
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 471 unless $FOCUS;
450}
451 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
452sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 484sub invoke_button_up { 0 }
454sub key_down { 0 } 485sub invoke_key_down { 0 }
455sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
456 488
457sub button_down { 489sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
459 491
460 $self->focus_in; 492 $self->grab_focus;
461 493
462 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 531}
464 532
465sub find_widget { 533sub find_widget {
466 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
467 535
… …
477sub set_parent { 545sub set_parent {
478 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
479 547
480 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 550}
506 551
507sub realloc { 552sub realloc {
508 my ($self) = @_; 553 my ($self) = @_;
509 554
… …
542 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
543 588
544 # update screen rectangle 589 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 592
550 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 596
… …
576 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
579 glEnd; 622 glEnd;
580 glPopMatrix; 623 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 625 }
583 626
584 $self->_draw; 627 $self->_draw;
585 glPopMatrix; 628 glPopMatrix;
586} 629}
… …
592} 635}
593 636
594sub DESTROY { 637sub DESTROY {
595 my ($self) = @_; 638 my ($self) = @_;
596 639
640 return if CFPlus::in_destruct;
641
597 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
598 643
599 eval { $self->destroy }; 644 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 646}
602 647
603############################################################################# 648#############################################################################
604 649
605package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
606 651
607our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
608 653
609use strict; 654use strict;
610use CFClient::OpenGL; 655use CFPlus::OpenGL;
611 656
612sub new { 657sub new {
613 my $class = shift; 658 my $class = shift;
614 659
615 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
646 } 691 }
647} 692}
648 693
649############################################################################# 694#############################################################################
650 695
651package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
652 697
653our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
654 699
655sub new { 700sub new {
656 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
658} 703}
… …
665 710
666sub draw { } 711sub draw { }
667 712
668############################################################################# 713#############################################################################
669 714
670package CFClient::UI::Container; 715package CFPlus::UI::Container;
671 716
672our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
673 718
674sub new { 719sub new {
675 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
676 721
677 my $children = delete $arg{children}; 722 my $children = delete $arg{children};
… …
686 if $children; 731 if $children;
687 732
688 $self 733 $self
689} 734}
690 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
691sub add { 744sub add {
692 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
693 746
694 $_->set_parent ($self) 747 $_->set_parent ($self)
695 for @widgets; 748 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
756} 809}
757 810
758############################################################################# 811#############################################################################
759 812
760package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
761 814
762our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
763 816
764sub new { 817sub new {
765 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
766 819
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 821
769 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
770} 823}
771 824
772sub add { 825sub add {
… …
779sub remove { 832sub remove {
780 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
781 834
782 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
783 836
784 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 838 unless @{$self->{children}};
786} 839}
787 840
788sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
789 842
790sub size_request { 843sub size_request {
791 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
792} 845}
793 846
794sub size_allocate { 847sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
796 849
797 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
798} 853}
799 854
800############################################################################# 855#############################################################################
801 856
802# back-buffered drawing area 857# back-buffered drawing area
803 858
804package CFClient::UI::Window; 859package CFPlus::UI::Window;
805 860
806our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
807 862
808use CFClient::OpenGL; 863use CFPlus::OpenGL;
809 864
810sub new { 865sub new {
811 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
812 867
813 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
818 873
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 875 $self->SUPER::update;
821} 876}
822 877
823sub size_allocate { 878sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
825 880
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
828} 884}
829 885
830sub _render { 886sub _render {
831 my ($self) = @_; 887 my ($self) = @_;
832 888
… …
834} 890}
835 891
836sub render_child { 892sub render_child {
837 my ($self) = @_; 893 my ($self) = @_;
838 894
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
842 898
843 { 899 {
844 package CFClient::UI::Base; 900 package CFPlus::UI::Base;
845 901
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 902 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
848 } 904 }
849 905
… …
868 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
869} 925}
870 926
871############################################################################# 927#############################################################################
872 928
873package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
874 930
875our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
876 932
877sub new { 933sub new {
878 my $class = shift; 934 my $class = shift;
879 935
880 $class->SUPER::new ( 936 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
894 950
895 ($w, $h) 951 ($w, $h)
896} 952}
897 953
898sub size_allocate { 954sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
900 956
901 my $child = $self->child; 957 my $child = $self->child;
902 958
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 961
906 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
907 $self->update; 963 $self->update;
964
965 1
908} 966}
909 967
910sub set_offset { 968sub set_offset {
911 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
912 970
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 998 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1000 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1002 }
945} 1003}
946 1004
947sub _render { 1005sub _render {
948 my ($self) = @_; 1006 my ($self) = @_;
949 1007
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1010
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1012
955 $self->SUPER::_render; 1013 $self->SUPER::_render;
956} 1014}
957 1015
958############################################################################# 1016#############################################################################
959 1017
960package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
961 1019
962our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
963 1021
964sub new { 1022sub new {
965 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
966 1024
967 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
968 1026
969 my $self; 1027 my $self;
970 1028
971 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1030 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1032 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
987 1046
988 $self 1047 $self
989} 1048}
990 1049
1050#TODO# update range on size_allocate depending on child
1051
991sub add { 1052sub add {
992 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
993 1054
994 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
995} 1056}
996 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
997sub update { 1074sub update {
998 my ($self) = @_; 1075 my ($self) = @_;
999 1076
1000 $self->SUPER::update; 1077 $self->SUPER::update;
1001 1078
1002 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1080}
1006 1081
1007sub size_allocate { 1082sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1009 1084
1085 $self->update_slider;
1086
1010 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1088}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1089
1019############################################################################# 1090#############################################################################
1020 1091
1021package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
1022 1093
1023our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
1024 1095
1025use CFClient::OpenGL; 1096use CFPlus::OpenGL;
1026 1097
1027sub new { 1098sub new {
1028 my $class = shift; 1099 my $class = shift;
1029 1100
1030 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1057} 1128}
1058 1129
1059############################################################################# 1130#############################################################################
1060 1131
1061package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1062 1133
1063our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1064 1135
1065use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1066 1137
1067my $bg = 1138my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1070 1141
1071my @border = 1142my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1145
1075sub new { 1146sub new {
1076 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1077 1148
1078 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1152 border => 0.6,
1082 can_events => 1, 1153 can_events => 1,
1083 min_w => 16, 1154 min_w => 64,
1084 min_h => 16, 1155 min_h => 32,
1085 %arg, 1156 %arg,
1086 ); 1157 );
1087 1158
1088 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1160 align => 0,
1090 valign => 1, 1161 valign => 1,
1091 text => $self->{title}, 1162 text => $self->{title},
1092 fontsize => $self->{border}, 1163 fontsize => $self->{border},
1093 if exists $self->{title}; 1164 if exists $self->{title};
1094 1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 }
1174
1095 $self 1175 $self
1096} 1176}
1097 1177
1098sub add { 1178sub add {
1099 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1100 1180
1101 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1184}
1104 1185
1105sub border { 1186sub border {
1106 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1107} 1188}
… …
1109sub size_request { 1190sub size_request {
1110 my ($self) = @_; 1191 my ($self) = @_;
1111 1192
1112 $self->{title_widget}->size_request 1193 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1114 1198
1115 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1116 1200
1117 ( 1201 (
1118 $w + $self->border * 2, 1202 $w + $self->border * 2,
1119 $h + $self->border * 2, 1203 $h + $self->border * 2,
1120 ) 1204 )
1121} 1205}
1122 1206
1123sub size_allocate { 1207sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1125 1209
1126 if ($self->{title_widget}) { 1210 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1214 }
1131 1215
1132 my $border = $self->border; 1216 my $border = $self->border;
1133 1217
1134 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1136 1233
1137 $self->child->configure ($border, $border, $w, $h); 1234 1
1138} 1235}
1139 1236
1140sub button_down { 1237sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1142 1239
1143 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1241 my $border = $self->border;
1145 1242
… …
1176 1273
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1275
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1279 };
1183 } else { 1280 } else {
1184 return 0; 1281 return 0;
1185 } 1282 }
1186 1283
1187 1 1284 1
1188} 1285}
1189 1286
1190sub button_up { 1287sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1192 1289
1193 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1194} 1291}
1195 1292
1196sub mouse_motion { 1293sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1198 1295
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1297
1201 !!$self->{motion} 1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1202} 1307}
1203 1308
1204sub _draw { 1309sub _draw {
1205 my ($self) = @_; 1310 my ($self) = @_;
1206 1311
… …
1235 $child->draw; 1340 $child->draw;
1236 1341
1237 if ($self->{title_widget}) { 1342 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1240 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1241} 1351}
1242 1352
1243############################################################################# 1353#############################################################################
1244 1354
1245package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1246 1356
1247our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1248 1358
1249use List::Util qw(max sum); 1359use List::Util qw(max sum);
1250 1360
1251use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1252 1362
1253sub new { 1363sub new {
1254 my $class = shift; 1364 my $class = shift;
1255 1365
1256 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1262sub children { 1372sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1374}
1265 1375
1266sub add { 1376sub add {
1267 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1268 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1381 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1271 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1387 $self->realloc;
1273} 1388}
1274 1389
1275sub remove { 1390sub remove {
1276 my ($self, $child) = @_; 1391 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1439 (sum @$ws),
1325 (sum @$hs), 1440 (sum @$hs),
1326 ) 1441 )
1327} 1442}
1328 1443
1329sub size_allocate { 1444sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1331 1446
1332 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1333 1448
1334 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1341 1456
1342 # linearly scale sizes 1457 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1460
1346 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1347 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1348 1463
1349 my $y; 1464 my $y;
1350 1465
1351 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1366 } 1481 }
1367 1482
1368 $y += $row_h; 1483 $y += $row_h;
1369 } 1484 }
1370 1485
1486 1
1371} 1487}
1372 1488
1373sub find_widget { 1489sub find_widget {
1374 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1375 1491
… …
1394 } 1510 }
1395} 1511}
1396 1512
1397############################################################################# 1513#############################################################################
1398 1514
1399package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1400 1516
1401our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1402 1518
1403sub size_request { 1519sub size_request {
1404 my ($self) = @_; 1520 my ($self) = @_;
1405 1521
1406 $self->{vertical} 1522 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1530 )
1415} 1531}
1416 1532
1417sub size_allocate { 1533sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1419 1535
1420 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1422 1538
1423 my @req; 1539 my @req;
1424 1540
1425 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1427 } else { 1543 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1430 1546
1431 if ($req > $space) { 1547 if ($req > $space) {
1432 # ah well, not enough space 1548 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1434 } else { 1550 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1552
1437 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1438 1554
1439 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1556 for 0 .. $#children;
1441 } 1557 }
1442 } 1558 }
1443 1559
1444 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1445 1561
1446 my $pos = 0; 1562 my $pos = 0;
1447 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1566
1451 $pos += $alloc; 1567 $pos += $alloc;
1452 } 1568 }
1453 1569
1454 1 1570 1
1455} 1571}
1456 1572
1457############################################################################# 1573#############################################################################
1458 1574
1459package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1460 1576
1461our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1462 1578
1463sub new { 1579sub new {
1464 my $class = shift; 1580 my $class = shift;
1465 1581
1466 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1469 ) 1585 )
1470} 1586}
1471 1587
1472############################################################################# 1588#############################################################################
1473 1589
1474package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1475 1591
1476our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1477 1593
1478sub new { 1594sub new {
1479 my $class = shift; 1595 my $class = shift;
1480 1596
1481 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1484 ) 1600 )
1485} 1601}
1486 1602
1487############################################################################# 1603#############################################################################
1488 1604
1489package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1490 1606
1491our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1492 1608
1493use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1494 1610
1495sub new { 1611sub new {
1496 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1497 1613
1498 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1502 #font => default_font 1618 #font => default_font
1503 #text => initial text 1619 #text => initial text
1504 #markup => initial narkup 1620 #markup => initial narkup
1505 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1506 ellipsise => 3, # end 1622 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1624 fontsize => 1,
1509 align => -1, 1625 align => -1,
1510 valign => -1, 1626 valign => -1,
1511 padding_x => 2, 1627 padding_x => 2,
1512 padding_y => 2, 1628 padding_y => 2,
1513 can_events => 0, 1629 can_events => 0,
1514 %arg 1630 %arg
1515 ); 1631 );
1516 1632
1517 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1636 $self->{template} = $layout;
1521 } 1637 }
1522 1638
1523 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1527 } 1643 }
1528 1644
1529 $self 1645 $self
1530} 1646}
1531 1647
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1648sub update {
1543 my ($self) = @_; 1649 my ($self) = @_;
1544 1650
1545 delete $self->{texture}; 1651 delete $self->{texture};
1546 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1558 1664
1559 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1561 1667
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1564 1669
1565 delete $self->{size_req}; 1670 delete $self->{size_req};
1566 $self->realloc; 1671 $self->realloc;
1567 $self->update; 1672 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1575 1680
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1682
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1580 1684
1581 delete $self->{size_req}; 1685 delete $self->{size_req};
1582 $self->realloc; 1686 $self->realloc;
1583 $self->update; 1687 $self->update;
… …
1595 1699
1596 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1597 1701
1598 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1706
1602 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1603 1708
1604 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
… …
1609 }; 1714 };
1610 1715
1611 @{ $self->{size_req} } 1716 @{ $self->{size_req} }
1612} 1717}
1613 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1614sub size_allocate { 1723sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1616 1725
1617 delete $self->{ox}; 1726 delete $self->{ox};
1618 1727
1619 delete $self->{texture} 1728 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1621} 1732}
1622 1733
1623sub set_fontsize { 1734sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1625 1736
1626 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1627 delete $self->{texture}; 1739 delete $self->{texture};
1628 1740
1629 $self->realloc; 1741 $self->realloc;
1630} 1742}
1631 1743
1632sub reconfigure { 1744sub reconfigure {
1633 my ($self) = @_; 1745 my ($self) = @_;
1634 1746
1635 delete $self->{size_req}; 1747 delete $self->{size_req};
1748 delete $self->{texture};
1636 1749
1637 $self->SUPER::reconfigure; 1750 $self->SUPER::reconfigure;
1638} 1751}
1639 1752
1640sub _draw { 1753sub _draw {
1641 my ($self) = @_; 1754 my ($self) = @_;
1642 1755
1643 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1644 1757
1645 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1765
1653 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1654 }; 1767 };
1655 1768
1656 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1660 1773
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1777 };
1665 1778
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1781
1671 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1783}
1682 1784
1683############################################################################# 1785#############################################################################
1684 1786
1685package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1686 1788
1687our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1688 1790
1689use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1690 1792
1691sub new { 1793sub new {
1692 my $class = shift; 1794 my $class = shift;
1693 1795
1694 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1718 1820
1719 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1823 delete $self->{size_req};
1722 1824
1723 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1724 1826
1725 $self->realloc; 1827 $self->realloc;
1726 $self->update; 1828 $self->update;
1727} 1829}
1728 1830
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1744 1846
1745 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1746} 1848}
1747 1849
1748sub key_down { 1850sub invoke_key_down {
1749 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1750 1852
1751 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1756 1858
1757 if ($uni == 8) { 1859 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1766 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1768 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1872 $self->emit ('escape');
1771 } elsif ($uni) { 1873 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1875 } else {
1774 return 0; 1876 return 0;
1775 } 1877 }
… …
1779 $self->realloc; 1881 $self->realloc;
1780 1882
1781 1 1883 1
1782} 1884}
1783 1885
1784sub focus_in { 1886sub invoke_focus_in {
1785 my ($self) = @_; 1887 my ($self) = @_;
1786 1888
1787 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1788 1890
1789 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1790} 1892}
1791 1893
1792sub button_down { 1894sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1794 1896
1795 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1898
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1900
1799 # byte-index to char-index 1901 # byte-index to char-index
1800 my $text = $self->{text}; 1902 my $text = $self->{text};
1801 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1803 1905
1804 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1805 $self->update; 1907 $self->update;
1806 1908
1807 1 1909 1
1808} 1910}
1809 1911
1810sub mouse_motion { 1912sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 1915
1814 0 1916 1
1815} 1917}
1816 1918
1817sub _draw { 1919sub _draw {
1818 my ($self) = @_; 1920 my ($self) = @_;
1819 1921
… …
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 1957 glEnd;
1856 } 1958 }
1857} 1959}
1858 1960
1859package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1860 1962
1861our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1862 1964
1863use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1864 1966
1865sub key_down { 1967sub invoke_key_down {
1866 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1867 1969
1868 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1869 1971
1870 if ($sym == 13) { 1972 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1873 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1876 $self->update; 1979 $self->update;
1877 1980
1878 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1881 } 1984 }
1882 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 1989 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 1991 }
1889 1992
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 1996
1894 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 1999 } else {
1897 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1898 } 2001 }
1899 2002
1900 } else { 2003 } else {
1901 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1902 } 2005 }
1903 2006
1904 1 2007 1
1905} 2008}
1906 2009
1907############################################################################# 2010#############################################################################
1908 2011
1909package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1910 2013
1911our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1912 2015
1913use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1914 2017
1915my @tex = 2018my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1918 2021
1919sub new { 2022sub new {
1920 my $class = shift; 2023 my $class = shift;
1921 2024
… …
1930 can_events => 1, 2033 can_events => 1,
1931 @_ 2034 @_
1932 ) 2035 )
1933} 2036}
1934 2037
1935sub activate { }
1936
1937sub button_up { 2038sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1939 2040
1940 $self->emit ("activate") 2041 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1961} 2062}
1962 2063
1963############################################################################# 2064#############################################################################
1964 2065
1965package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1966 2067
1967our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1968 2069
1969my @tex = 2070my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2073
1973use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1974 2075
1975sub new { 2076sub new {
1976 my $class = shift; 2077 my $class = shift;
1977 2078
1978 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1992 my ($self) = @_; 2093 my ($self) = @_;
1993 2094
1994 (6) x 2 2095 (6) x 2
1995} 2096}
1996 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1997sub button_down { 2106sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1999 2108
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2111 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2112 } else {
2005 return 0 2113 return 0
2006 } 2114 }
2007 2115
2008 1 2116 1
… …
2028 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
2029} 2137}
2030 2138
2031############################################################################# 2139#############################################################################
2032 2140
2033package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2034 2142
2035our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2036 2144
2037use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2146
2040our %loaded_images; 2147our %texture_cache;
2041 2148
2042sub new { 2149sub new {
2043 my $class = shift; 2150 my $class = shift;
2044 2151
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2046 2156
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2048 2159
2049 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2162
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2164
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2166
2058 $self 2167 $self
2059} 2168}
2060 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2061sub size_request { 2185sub size_request {
2062 my ($self) = @_; 2186 my ($self) = @_;
2063 2187
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2065} 2189}
2066 2190
2067sub _draw { 2191sub _draw {
2068 my ($self) = @_; 2192 my ($self) = @_;
2069 2193
… …
2079 } 2203 }
2080 2204
2081 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2207
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2085 2209
2086 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2087} 2211}
2088 2212
2089############################################################################# 2213#############################################################################
2090 2214
2215package CFPlus::UI::ImageButton;
2216
2217our @ISA = CFPlus::UI::Image::;
2218
2219use CFPlus::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2247}
2248
2249#############################################################################
2250
2091package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2092 2252
2093our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2094 2254
2095use List::Util qw(min max); 2255use List::Util qw(min max);
2096 2256
2097use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2098 2258
2099my %tex = ( 2259my %tex = (
2100 food => [ 2260 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2263 ],
2104 grace => [ 2264 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2267 ],
2108 hp => [ 2268 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2271 ],
2112 mana => [ 2272 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2275 ],
2116); 2276);
2117 2277
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2340
2181 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2346
2184 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2206 2369
2207 if ($t3) { 2370 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2377 glEnd;
2215 } 2378 }
2216 2379
2217 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2219} 2382}
2220 2383
2221############################################################################# 2384#############################################################################
2222 2385
2223package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2224 2387
2225our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2226 2389
2227sub new { 2390sub new {
2228 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2229 2392
2230 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2395 can_hover => 1,
2233 can_events => 1, 2396 can_events => 1,
2234 %arg, 2397 %arg,
2235 ); 2398 );
2236 2399
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2401 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2403
2241 $self 2404 $self
2242} 2405}
2243 2406
2244sub set_fontsize { 2407sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2266} 2429}
2267 2430
2268############################################################################# 2431#############################################################################
2269 2432
2270package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2271 2434
2272use strict; 2435use strict;
2273 2436
2274use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2275 2438
2276our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2277 2440
2278my @tex = 2441my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2281 2444
2282sub new { 2445sub new {
2283 my $class = shift; 2446 my $class = shift;
2284 2447
… …
2305 $self->update; 2468 $self->update;
2306 2469
2307 $self 2470 $self
2308} 2471}
2309 2472
2310sub changed { }
2311
2312sub set_range { 2473sub set_range {
2313 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2314 2475
2315 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2316 2477
… …
2336 if $unit; 2497 if $unit;
2337 2498
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2500
2340 if ($value != $old_value) { 2501 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2342 $self->update; 2503 $self->update;
2343 } 2504 }
2344} 2505}
2345 2506
2346sub size_request { 2507sub size_request {
2347 my ($self) = @_; 2508 my ($self) = @_;
2348 2509
2349 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2350} 2511}
2351 2512
2352sub button_down { 2513sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2354 2515
2355 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2517
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2519
2359 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2521}
2361 2522
2362sub mouse_motion { 2523sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2364 2525
2365 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2528
… …
2373 } else { 2534 } else {
2374 return 0; 2535 return 0;
2375 } 2536 }
2376 2537
2377 1 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2378} 2549}
2379 2550
2380sub update { 2551sub update {
2381 my ($self) = @_; 2552 my ($self) = @_;
2382 2553
… …
2431 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2432} 2603}
2433 2604
2434############################################################################# 2605#############################################################################
2435 2606
2436package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2437 2608
2438our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2439 2610
2440sub new { 2611sub new {
2441 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2442 2613
2443 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2444 2615
2445 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2619 to_value => sub { shift },
2449 from_value => sub { shift }, 2620 from_value => sub { shift },
2450 %arg, 2621 %arg,
2451 ); 2622 );
2452 2623
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2474 2645
2475############################################################################# 2646#############################################################################
2476 2647
2477package CFClient::UI::TextScroller; 2648package CFPlus::UI::TextScroller;
2478 2649
2479our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2480 2651
2481use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2482 2653
2483sub new { 2654sub new {
2484 my $class = shift; 2655 my $class = shift;
2485 2656
2486 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2487 fontsize => 1, 2658 fontsize => 1,
2488 can_events => 0, 2659 can_events => 1,
2489 indent => 0, 2660 indent => 0,
2490 #font => default_font 2661 #font => default_font
2491 @_, 2662 @_,
2492 2663
2493 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2494 par => [], 2665 par => [],
2495 height => 0, 2666 height => 0,
2496 children => [ 2667 children => [
2497 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2670 ],
2500 ); 2671 );
2501 2672
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2674
… …
2509 2680
2510 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2682 $self->reflow;
2512} 2683}
2513 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2514sub size_allocate { 2694sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2516 2696
2517 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2699
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2704
2524 $self->reflow; 2705 $self->reflow;
2525}
2526 2706
2527sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2529 2723
2530 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2531 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2536 2737 );
2738
2537 $layout->size 2739 $layout
2538} 2740}
2539 2741
2540sub reflow { 2742sub reflow {
2541 my ($self) = @_; 2743 my ($self) = @_;
2542 2744
… …
2551 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2552} 2754}
2553 2755
2554sub clear { 2756sub clear {
2555 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2556 2761
2557 $self->{par} = []; 2762 $self->{par} = [];
2558 $self->{height} = 0; 2763 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2765}
2561 2766
2562sub add_paragraph { 2767sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2564 2769
2565 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2567 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2569 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2570 2780
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2572} 2794}
2573 2795
2574sub update { 2796sub update {
2575 my ($self) = @_; 2797 my ($self) = @_;
2576 2798
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2807
2586 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2809 my $height = 0;
2588 2810
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2815
2600 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2601 } 2819 }
2602 2820
2603 $height += $_->[1]; 2821 $height += $para->{h};
2604 } 2822 }
2605 2823
2606 $self->{height} = $height; 2824 $self->{height} = $height;
2607 2825
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2609 2827
2610 delete $self->{texture}; 2828 delete $self->{texture};
2611 } 2829 }
2612 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2616 2838
2617 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2618 2840
2619 my $y0 = $top; 2841 my $y0 = $top;
2620 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2621 2843
2622 my $y = 0; 2844 my $y = 0;
2623 2845
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2847 my $h = $para->{h};
2634 2848
2635 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2850
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2642 2852
2643 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2645 } 2867 }
2646 2868
2647 $y += $h; 2869 $y += $h;
2648 } 2870 }
2649
2650 glDisable GL_BLEND;
2651 }; 2871 };
2652 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2653} 2882}
2654 2883
2655sub _draw { 2884sub _draw {
2656 my ($self) = @_; 2885 my ($self) = @_;
2657 2886
… …
2660 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2663 2892
2664 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2665
2666} 2894}
2667 2895
2668############################################################################# 2896#############################################################################
2669 2897
2670package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2671 2899
2672use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2673 2901
2674our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2675 2903
2676sub moveto { 2904sub moveto {
2677 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2678 2906
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 2935 glPopMatrix;
2708} 2936}
2709 2937
2710############################################################################# 2938#############################################################################
2711 2939
2712package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2713 2941
2714our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2715 2943
2716sub new { 2944sub new {
2717 my $class = shift; 2945 my $class = shift;
2718 2946
2719 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2732} 2960}
2733 2961
2734############################################################################# 2962#############################################################################
2735 2963
2736package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2737 2965
2738our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2739 2967
2740use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2741 2969
2742sub new { 2970sub new {
2743 my $class = shift; 2971 my $class = shift;
2744 2972
2745 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2761 } 2989 }
2762 2990
2763 $tooltip =~ s/^\n+//; 2991 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 2992 $tooltip =~ s/\n+$//;
2765 2993
2766 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 2995 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 2997 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2771 ellipsise => 0, 2999 ellipsise => 0,
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3008
2781 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2782} 3010}
2783 3011
2784sub size_allocate { 3012sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2786 3014
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3016}
2789 3017
2790sub visibility_change { 3018sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2792 3020
2793 return unless $visible; 3021 return unless $visible;
2794 3022
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2797 or return; 3025 or return;
2798 3026
3027 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3029
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2803 3032
2804 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2805 }); 3037 });
2806} 3038}
2807 3039
2808sub _draw { 3040sub _draw {
2809 my ($self) = @_; 3041 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2834} 3066}
2835 3067
2836############################################################################# 3068#############################################################################
2837 3069
2838package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2839 3071
2840our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2841 3073
2842use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2843 3075
2844sub new { 3076sub new {
2845 my $class = shift; 3077 my $class = shift;
2846 3078
2847 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2882sub _draw { 3114sub _draw {
2883 my ($self) = @_; 3115 my ($self) = @_;
2884 3116
2885 return unless $::CONN; 3117 return unless $::CONN;
2886 3118
3119 $self->SUPER::_draw;
3120
2887 my $face; 3121 my $face;
2888 3122
2889 if ($self->{frame}) { 3123 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3125
… …
2913 $self->SUPER::destroy; 3147 $self->SUPER::destroy;
2914} 3148}
2915 3149
2916############################################################################# 3150#############################################################################
2917 3151
2918package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2919 3153
2920our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2921 3155
2922# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2923 3157
2924############################################################################# 3158#############################################################################
2925 3159
2926package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2927 3161
2928our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2929 3163
2930use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2931 3165
2932sub new { 3166sub new {
2933 my $class = shift; 3167 my $class = shift;
2934 3168
2935 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2936 items => [], 3170 items => [],
2937 z => 100, 3171 z => 100,
2938 @_, 3172 @_,
2939 ); 3173 );
2940 3174
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3176
2943 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2945 3179
2946 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2947 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2948 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3186 can_hover => 1,
2950 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
2951 markup => $widget, 3199 markup => $widget,
2952 tooltip => $tooltip 3200 tooltip => $tooltip;
3201 }
2953 } 3202 }
2954 3203
2955 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2956 3205
2957 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2962 3211
2963# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2964sub popup { 3213sub popup {
2965 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2966 3215
2967 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2968 3217
2969 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3219 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2972 3221
2973 $self->show; 3222 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3224}
2976 3225
2977sub mouse_motion { 3226sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2979 3228
2980 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2983 3232
2984 0 3233 0
2985} 3234}
2986 3235
2987sub button_up { 3236sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2989 3238
2990 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3240 undef $GRAB;
2992 $self->hide; 3241 $self->hide;
2993 3242
2994 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3245 } else {
2997 return 0 3246 return 0
2998 } 3247 }
2999 3248
3000 1 3249 1
3001} 3250}
3002 3251
3003############################################################################# 3252#############################################################################
3004 3253
3005package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
3006 3255
3007our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
3008 3257
3009sub new { 3258sub new {
3010 my $class = shift; 3259 my $class = shift;
3011 3260
3012 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
3026 3275
3027 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3029} 3278}
3030 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3031sub set_current_page { 3286sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3033 3288
3034 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3290 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3037 3292
3038 $self->{current} = $widget; 3293 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3295
3041 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3042 3297
3043 $self->realloc; 3298 $self->realloc;
3044} 3299}
3045 3300
3046sub visible_children { 3301sub visible_children {
… …
3051 my ($self) = @_; 3306 my ($self) = @_;
3052 3307
3053 $self->{current}->size_request 3308 $self->{current}->size_request
3054} 3309}
3055 3310
3056sub size_allocate { 3311sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3058 3313
3059 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3060} 3317}
3061 3318
3062sub _draw { 3319sub _draw {
3063 my ($self) = @_; 3320 my ($self) = @_;
3064 3321
3065 $self->{current}->draw; 3322 $self->{current}->draw;
3066} 3323}
3067 3324
3068############################################################################# 3325#############################################################################
3069 3326
3070package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3071 3328
3072our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3073 3330
3074sub new { 3331sub new {
3075 my $class = shift; 3332 my $class = shift;
3076 3333
3077 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3081 @_, 3338 @_,
3082 ); 3339 );
3083 3340
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3090sub add { 3347sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3092 3349
3093 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3094 3351
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3353 markup => $title,
3097 tooltip => $tooltip, 3354 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3356 );
3100 3357
3101 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3102} 3359}
3103 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3104sub set_current_page { 3367sub set_current_page {
3105 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3106 3369
3107 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3372}
3110 3373
3111############################################################################# 3374#############################################################################
3112 3375
3113package CFClient::UI::Combobox; 3376package CFPlus::UI::Selector;
3114 3377
3115use utf8; 3378use utf8;
3116 3379
3117our @ISA = CFClient::UI::Button::; 3380our @ISA = CFPlus::UI::Button::;
3118 3381
3119sub new { 3382sub new {
3120 my $class = shift; 3383 my $class = shift;
3121 3384
3122 my $self = $class->SUPER::new ( 3385 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3391 $self->_set_value ($self->{value});
3129 3392
3130 $self 3393 $self
3131} 3394}
3132 3395
3133sub button_down { 3396sub invoke_button_down {
3134 my ($self, $ev) = @_; 3397 my ($self, $ev) = @_;
3135 3398
3136 my @menu_items; 3399 my @menu_items;
3137 3400
3138 for (@{ $self->{options} }) { 3401 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3402 my ($value, $title, $tooltip) = @$_;
3140 3403
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3405 }
3143 3406
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3408}
3146 3409
3147sub _set_value { 3410sub _set_value {
3148 my ($self, $value) = @_; 3411 my ($self, $value) = @_;
3149 3412
… …
3159 my ($self, $value) = @_; 3422 my ($self, $value) = @_;
3160 3423
3161 return unless $self->{value} ne $value; 3424 return unless $self->{value} ne $value;
3162 3425
3163 $self->_set_value ($value); 3426 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3427 $self->emit (changed => $value);
3165} 3428}
3166 3429
3167############################################################################# 3430#############################################################################
3168 3431
3169package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3170 3433
3171our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3172 3435
3173sub new { 3436sub new {
3174 my $class = shift; 3437 my $class = shift;
3175 3438
3176 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3188sub reorder { 3451sub reorder {
3189 my ($self) = @_; 3452 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3191 3454
3192 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3196 3459
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3462 }
… …
3220 for ($short) { 3483 for ($short) {
3221 s/^\s+//; 3484 s/^\s+//;
3222 s/\s+/ /g; 3485 s/\s+/ /g;
3223 } 3486 }
3224 3487
3225 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3226 markup => $short, 3489 markup => $short,
3227 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3547 count => 1,
3285 %arg, 3548 %arg,
3286 }; 3549 };
3287 } 3550 }
3288 3551
3552 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3553 $self->reorder;
3554 });
3290} 3555}
3291 3556
3292sub reconfigure { 3557sub reconfigure {
3293 my ($self) = @_; 3558 my ($self) = @_;
3294 3559
… …
3307 $self->SUPER::destroy; 3572 $self->SUPER::destroy;
3308} 3573}
3309 3574
3310############################################################################# 3575#############################################################################
3311 3576
3312package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3313 3578
3314our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3315 3580
3316sub new { 3581sub new {
3317 my $class = shift; 3582 my $class = shift;
3318 3583
3319 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3321 @_, 3587 @_,
3322 ); 3588 );
3323 3589
3590 $self->set_sort_order (undef);
3591
3324 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3325} 3628}
3326 3629
3327sub set_items { 3630sub set_items {
3328 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3329 3632
3330 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3331 return unless $items; 3634 $self->update_items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350} 3635}
3351 3636
3352############################################################################# 3637#############################################################################
3353 3638
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3552 3640
3553our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3554 3642
3555sub new { 3643sub new {
3556 my $class = shift; 3644 my $class = shift;
3557 3645
3558 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577 3665
3578sub rebuild_spell_list { 3666sub rebuild_spell_list {
3579 my ($self) = @_; 3667 my ($self) = @_;
3580 3668
3581 $CFClient::UI::ROOT->on_refresh ($self => sub { 3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear; 3670 $self->clear;
3583 3671
3584 return unless $::CONN; 3672 return unless $::CONN;
3585 3673
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591 3679
3592 my $row = 0; 3680 my $row = 0;
3593 3681
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_}; 3683 my $spell = $self->{spell}{$_};
… …
3602 if ($ev->{button} == 1) { 3690 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}"); 3691 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) { 3692 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3693 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3694 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3695 (new CFPlus::UI::Menu
3608 items => [ 3696 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3699 ],
3612 )->popup ($ev); 3700 )->popup ($ev);
3613 } else { 3701 } else {
3614 return 0; 3702 return 0;
… …
3618 }; 3706 };
3619 3707
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621 3709
3622 #TODO: add path info to tooltip 3710 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3624 3712
3625 $self->add (0, $row, new CFClient::UI::Face 3713 $self->add (0, $row, new CFPlus::UI::Face
3626 face => $spell->{face}, 3714 face => $spell->{face},
3627 can_hover => 1, 3715 can_hover => 1,
3628 can_events => 1, 3716 can_events => 1,
3629 tooltip => $tooltip, 3717 tooltip => $tooltip,
3630 on_button_down => $spell_cb, 3718 on_button_down => $spell_cb,
3631 ); 3719 );
3632 3720
3633 $self->add (1, $row, new CFClient::UI::Label 3721 $self->add (1, $row, new CFPlus::UI::Label
3634 expand => 1, 3722 expand => 1,
3635 text => $spell->{name}, 3723 text => $spell->{name},
3636 can_hover => 1, 3724 can_hover => 1,
3637 can_events => 1, 3725 can_events => 1,
3638 tooltip => $tooltip, 3726 tooltip => $tooltip,
3639 on_button_down => $spell_cb, 3727 on_button_down => $spell_cb,
3640 ); 3728 );
3641 3729
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 } 3734 }
3647 }); 3735 });
3648} 3736}
3649 3737
3650sub add_spell { 3738sub add_spell {
… …
3668 $self->rebuild_spell_list; 3756 $self->rebuild_spell_list;
3669} 3757}
3670 3758
3671############################################################################# 3759#############################################################################
3672 3760
3673package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3674 3762
3675our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3676 3764
3677use List::Util qw(min max); 3765use List::Util qw(min max);
3678 3766
3679use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3680 3768
3681sub new { 3769sub new {
3682 my $class = shift; 3770 my $class = shift;
3683 3771
3684 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3709 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3710 3798
3711 int $coord + 0.5 3799 int $coord + 0.5
3712} 3800}
3713 3801
3714sub size_allocate { 3802sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3716 3804
3717 for my $child ($self->children) { 3805 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3807
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3725 3813
3726 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3727 } 3815 }
3816
3817 1
3728} 3818}
3729 3819
3730sub coord2local { 3820sub coord2local {
3731 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3732 3822
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 3949
3860 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3862 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3863 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3865 3964
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 3991 glLoadIdentity;
3893 3992
3894 { 3993 {
3895 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3896 3995
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3899 } 3998 }
3900 3999
3901 $self->_draw; 4000 $self->_draw;
3902} 4001}
3903 4002
3904############################################################################# 4003#############################################################################
3905 4004
3906package CFClient::UI; 4005package CFPlus::UI;
3907 4006
3908$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4009
39111 40101
3912 4011

Diff Legend

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