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.303 by elmex, Tue Jun 13 10:28:38 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
1095 unless ($self->{no_close_button}) { 1166 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1167 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1168 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1169 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1170 on_activate => sub { $self->emit ("delete") };
1100 1171
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1173 }
1103 1174
1104 $self 1175 $self
1105} 1176}
1106 1177
1107sub add { 1178sub add {
1108 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1109 1180
1110 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $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};
1113} 1184}
1114 1185
1115sub border { 1186sub border {
1116 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1117} 1188}
… …
1120 my ($self) = @_; 1191 my ($self) = @_;
1121 1192
1122 $self->{title_widget}->size_request 1193 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1194 if $self->{title_widget};
1124 1195
1125 $self->{close_btn}->size_request 1196 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1197 if $self->{close_button};
1127 1198
1128 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1129 1200
1130 ( 1201 (
1131 $w + $self->border * 2, 1202 $w + $self->border * 2,
1132 $h + $self->border * 2, 1203 $h + $self->border * 2,
1133 ) 1204 )
1134} 1205}
1135 1206
1136sub size_allocate { 1207sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1138 1209
1139 if ($self->{title_widget}) { 1210 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1214 }
1144 1215
1145 my $border = $self->border; 1216 my $border = $self->border;
1146 1217
1147 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1149 1220
1150 $self->child->configure ($border, $border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1151 1222
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1224 if $self->{close_button};
1154}
1155 1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1234 1
1235}
1236
1156sub button_down { 1237sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1158 1239
1159 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1241 my $border = $self->border;
1161 1242
… …
1192 1273
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1275
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1279 };
1199 } else { 1280 } else {
1200 return 0; 1281 return 0;
1201 } 1282 }
1202 1283
1203 1 1284 1
1204} 1285}
1205 1286
1206sub button_up { 1287sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1208 1289
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1213} 1291}
1214 1292
1215sub mouse_motion { 1293sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1217 1295
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1297
1220 !!$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
1221} 1307}
1222 1308
1223sub _draw { 1309sub _draw {
1224 my ($self) = @_; 1310 my ($self) = @_;
1225 1311
… …
1258 $self->{title_widget}->_draw; 1344 $self->{title_widget}->_draw;
1259 1345
1260 glTranslate 0, - ($border - $self->{h}); 1346 glTranslate 0, - ($border - $self->{h});
1261 } 1347 }
1262 1348
1263 $self->{close_btn}->draw 1349 $self->{close_button}->draw
1264 if $self->{close_btn}; 1350 if $self->{close_button};
1265} 1351}
1266 1352
1267############################################################################# 1353#############################################################################
1268 1354
1269package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1270 1356
1271our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1272 1358
1273use List::Util qw(max sum); 1359use List::Util qw(max sum);
1274 1360
1275use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1276 1362
1277sub new { 1363sub new {
1278 my $class = shift; 1364 my $class = shift;
1279 1365
1280 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1286sub children { 1372sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288} 1374}
1289 1375
1290sub add { 1376sub add {
1291 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1292 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1293 $child->set_parent ($self); 1381 $child->set_parent ($self);
1294 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1295 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1296 $self->realloc; 1387 $self->realloc;
1297} 1388}
1298 1389
1299sub remove { 1390sub remove {
1300 my ($self, $child) = @_; 1391 my ($self, $child) = @_;
… …
1348 (sum @$ws), 1439 (sum @$ws),
1349 (sum @$hs), 1440 (sum @$hs),
1350 ) 1441 )
1351} 1442}
1352 1443
1353sub size_allocate { 1444sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1355 1446
1356 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1357 1448
1358 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1365 1456
1366 # linearly scale sizes 1457 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1460
1370 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1371 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1372 1463
1373 my $y; 1464 my $y;
1374 1465
1375 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1376 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1390 } 1481 }
1391 1482
1392 $y += $row_h; 1483 $y += $row_h;
1393 } 1484 }
1394 1485
1486 1
1395} 1487}
1396 1488
1397sub find_widget { 1489sub find_widget {
1398 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1399 1491
… …
1418 } 1510 }
1419} 1511}
1420 1512
1421############################################################################# 1513#############################################################################
1422 1514
1423package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1424 1516
1425our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1426 1518
1427sub size_request { 1519sub size_request {
1428 my ($self) = @_; 1520 my ($self) = @_;
1429 1521
1430 $self->{vertical} 1522 $self->{vertical}
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1530 )
1439} 1531}
1440 1532
1441sub size_allocate { 1533sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1443 1535
1444 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1446 1538
1447 my @req; 1539 my @req;
1448 1540
1449 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1451 } else { 1543 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1454 1546
1455 if ($req > $space) { 1547 if ($req > $space) {
1456 # ah well, not enough space 1548 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1458 } else { 1550 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1552
1461 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1462 1554
1463 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1556 for 0 .. $#children;
1465 } 1557 }
1466 } 1558 }
1467 1559
1468 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1469 1561
1470 my $pos = 0; 1562 my $pos = 0;
1471 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1473 $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));
1474 1566
1475 $pos += $alloc; 1567 $pos += $alloc;
1476 } 1568 }
1477 1569
1478 1 1570 1
1479} 1571}
1480 1572
1481############################################################################# 1573#############################################################################
1482 1574
1483package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1484 1576
1485our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1486 1578
1487sub new { 1579sub new {
1488 my $class = shift; 1580 my $class = shift;
1489 1581
1490 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1493 ) 1585 )
1494} 1586}
1495 1587
1496############################################################################# 1588#############################################################################
1497 1589
1498package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1499 1591
1500our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1501 1593
1502sub new { 1594sub new {
1503 my $class = shift; 1595 my $class = shift;
1504 1596
1505 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1508 ) 1600 )
1509} 1601}
1510 1602
1511############################################################################# 1603#############################################################################
1512 1604
1513package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1514 1606
1515our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1516 1608
1517use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1518 1610
1519sub new { 1611sub new {
1520 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1521 1613
1522 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1526 #font => default_font 1618 #font => default_font
1527 #text => initial text 1619 #text => initial text
1528 #markup => initial narkup 1620 #markup => initial narkup
1529 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1530 ellipsise => 3, # end 1622 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1624 fontsize => 1,
1533 align => -1, 1625 align => -1,
1534 valign => -1, 1626 valign => -1,
1535 padding_x => 2, 1627 padding_x => 2,
1536 padding_y => 2, 1628 padding_y => 2,
1537 can_events => 0, 1629 can_events => 0,
1538 %arg 1630 %arg
1539 ); 1631 );
1540 1632
1541 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1636 $self->{template} = $layout;
1545 } 1637 }
1546 1638
1547 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1551 } 1643 }
1552 1644
1553 $self 1645 $self
1554} 1646}
1555 1647
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1648sub update {
1567 my ($self) = @_; 1649 my ($self) = @_;
1568 1650
1569 delete $self->{texture}; 1651 delete $self->{texture};
1570 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1582 1664
1583 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1585 1667
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1588 1669
1589 delete $self->{size_req}; 1670 delete $self->{size_req};
1590 $self->realloc; 1671 $self->realloc;
1591 $self->update; 1672 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1599 1680
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1682
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1604 1684
1605 delete $self->{size_req}; 1685 delete $self->{size_req};
1606 $self->realloc; 1686 $self->realloc;
1607 $self->update; 1687 $self->update;
… …
1619 1699
1620 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1621 1701
1622 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1706
1626 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1627 1708
1628 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
… …
1633 }; 1714 };
1634 1715
1635 @{ $self->{size_req} } 1716 @{ $self->{size_req} }
1636} 1717}
1637 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1638sub size_allocate { 1723sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1640 1725
1641 delete $self->{ox}; 1726 delete $self->{ox};
1642 1727
1643 delete $self->{texture} 1728 delete $self->{texture}
1644 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
1645} 1732}
1646 1733
1647sub set_fontsize { 1734sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1649 1736
1650 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1651 delete $self->{texture}; 1739 delete $self->{texture};
1652 1740
1653 $self->realloc; 1741 $self->realloc;
1654} 1742}
1655 1743
1656sub reconfigure { 1744sub reconfigure {
1657 my ($self) = @_; 1745 my ($self) = @_;
1658 1746
1659 delete $self->{size_req}; 1747 delete $self->{size_req};
1748 delete $self->{texture};
1660 1749
1661 $self->SUPER::reconfigure; 1750 $self->SUPER::reconfigure;
1662} 1751}
1663 1752
1664sub _draw { 1753sub _draw {
1665 my ($self) = @_; 1754 my ($self) = @_;
1666 1755
1667 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1668 1757
1669 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1765
1677 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1678 }; 1767 };
1679 1768
1680 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1684 1773
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1777 };
1689 1778
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1781
1695 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1783}
1706 1784
1707############################################################################# 1785#############################################################################
1708 1786
1709package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1710 1788
1711our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1712 1790
1713use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1714 1792
1715sub new { 1793sub new {
1716 my $class = shift; 1794 my $class = shift;
1717 1795
1718 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1742 1820
1743 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1823 delete $self->{size_req};
1746 1824
1747 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1748 1826
1749 $self->realloc; 1827 $self->realloc;
1750 $self->update; 1828 $self->update;
1751} 1829}
1752 1830
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1768 1846
1769 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1770} 1848}
1771 1849
1772sub key_down { 1850sub invoke_key_down {
1773 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1774 1852
1775 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1780 1858
1781 if ($uni == 8) { 1859 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1790 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1792 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1872 $self->emit ('escape');
1795 } elsif ($uni) { 1873 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1875 } else {
1798 return 0; 1876 return 0;
1799 } 1877 }
… …
1803 $self->realloc; 1881 $self->realloc;
1804 1882
1805 1 1883 1
1806} 1884}
1807 1885
1808sub focus_in { 1886sub invoke_focus_in {
1809 my ($self) = @_; 1887 my ($self) = @_;
1810 1888
1811 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1812 1890
1813 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1814} 1892}
1815 1893
1816sub button_down { 1894sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1818 1896
1819 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1898
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1900
1823 # byte-index to char-index 1901 # byte-index to char-index
1824 my $text = $self->{text}; 1902 my $text = $self->{text};
1825 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1827 1905
1828 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1829 $self->update; 1907 $self->update;
1830 1908
1831 1 1909 1
1832} 1910}
1833 1911
1834sub mouse_motion { 1912sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1836# 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#
1837 1915
1838 0 1916 1
1839} 1917}
1840 1918
1841sub _draw { 1919sub _draw {
1842 my ($self) = @_; 1920 my ($self) = @_;
1843 1921
… …
1878 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};
1879 glEnd; 1957 glEnd;
1880 } 1958 }
1881} 1959}
1882 1960
1883package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1884 1962
1885our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1886 1964
1887use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1888 1966
1889sub key_down { 1967sub invoke_key_down {
1890 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1891 1969
1892 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1893 1971
1894 if ($sym == 13) { 1972 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1897 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1900 $self->update; 1979 $self->update;
1901 1980
1902 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1905 } 1984 }
1906 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 1989 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 1991 }
1913 1992
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 1996
1918 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 1999 } else {
1921 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1922 } 2001 }
1923 2002
1924 } else { 2003 } else {
1925 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1926 } 2005 }
1927 2006
1928 1 2007 1
1929} 2008}
1930 2009
1931############################################################################# 2010#############################################################################
1932 2011
1933package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1934 2013
1935our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1936 2015
1937use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1938 2017
1939my @tex = 2018my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1942 2021
1943sub new { 2022sub new {
1944 my $class = shift; 2023 my $class = shift;
1945 2024
… …
1954 can_events => 1, 2033 can_events => 1,
1955 @_ 2034 @_
1956 ) 2035 )
1957} 2036}
1958 2037
1959sub activate { }
1960
1961sub button_up { 2038sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1963 2040
1964 $self->emit ("activate") 2041 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1984 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1985} 2062}
1986 2063
1987############################################################################# 2064#############################################################################
1988 2065
2066package CFPlus::UI::CheckBox;
2067
2068our @ISA = CFPlus::UI::DrawBG::;
2069
2070my @tex =
2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073
2074use CFPlus::OpenGL;
2075
2076sub new {
2077 my $class = shift;
2078
2079 $class->SUPER::new (
2080 padding_x => 2,
2081 padding_y => 2,
2082 fg => [1, 1, 1],
2083 active_fg => [1, 1, 0],
2084 bg => [0, 0, 0, 0.2],
2085 active_bg => [1, 1, 1, 0.5],
2086 state => 0,
2087 can_hover => 1,
2088 @_
2089 )
2090}
2091
2092sub size_request {
2093 my ($self) = @_;
2094
2095 (6) x 2
2096}
2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
2106sub invoke_button_down {
2107 my ($self, $ev, $x, $y) = @_;
2108
2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2111 $self->toggle;
2112 } else {
2113 return 0
2114 }
2115
2116 1
2117}
2118
2119sub _draw {
2120 my ($self) = @_;
2121
2122 $self->SUPER::_draw;
2123
2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2125
2126 my ($w, $h) = @$self{qw(w h)};
2127
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129
2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2131
2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
2133
2134 glEnable GL_TEXTURE_2D;
2135 $tex->draw_quad_alpha (0, 0, $s, $s);
2136 glDisable GL_TEXTURE_2D;
2137}
2138
2139#############################################################################
2140
2141package CFPlus::UI::Image;
2142
2143our @ISA = CFPlus::UI::Base::;
2144
2145use CFPlus::OpenGL;
2146
2147our %texture_cache;
2148
2149sub new {
2150 my $class = shift;
2151
2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2156
2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2159
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162
2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2164
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166
2167 $self
2168}
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
2185sub size_request {
2186 my ($self) = @_;
2187
2188 ($self->{tex}{w}, $self->{tex}{h})
2189}
2190
2191sub _draw {
2192 my ($self) = @_;
2193
2194 my $tex = $self->{tex};
2195
2196 my ($w, $h) = ($self->{w}, $self->{h});
2197
2198 if ($self->{rot90}) {
2199 glRotate 90, 0, 0, 1;
2200 glTranslate 0, -$self->{w}, 0;
2201
2202 ($w, $h) = ($h, $w);
2203 }
2204
2205 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207
2208 $tex->draw_quad (0, 0, $w, $h);
2209
2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
1989package CFClient::UI::ImageButton; 2215package CFPlus::UI::ImageButton;
1990 2216
1991our @ISA = CFClient::UI::Image::; 2217our @ISA = CFPlus::UI::Image::;
1992 2218
1993use CFClient::OpenGL; 2219use CFPlus::OpenGL;
1994 2220
1995my %textures; 2221my %textures;
1996 2222
1997sub new { 2223sub new {
1998 my $class = shift; 2224 my $class = shift;
… …
2008 can_events => 1, 2234 can_events => 1,
2009 @_ 2235 @_
2010 ); 2236 );
2011} 2237}
2012 2238
2013sub activate { }
2014
2015sub button_up { 2239sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2240 my ($self, $ev, $x, $y) = @_;
2017 2241
2018 $self->emit ("activate") 2242 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2243 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2244 && $y >= 0 && $y < $self->{h};
… …
2022 1 2246 1
2023} 2247}
2024 2248
2025############################################################################# 2249#############################################################################
2026 2250
2027package CFClient::UI::CheckBox;
2028
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image; 2251package CFPlus::UI::VGauge;
2096 2252
2097our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2254
2157use List::Util qw(min max); 2255use List::Util qw(min max);
2158 2256
2159use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2160 2258
2161my %tex = ( 2259my %tex = (
2162 food => [ 2260 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2263 ],
2166 grace => [ 2264 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 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/
2169 ], 2267 ],
2170 hp => [ 2268 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2271 ],
2174 mana => [ 2272 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 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/
2177 ], 2275 ],
2178); 2276);
2179 2277
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2340
2243 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2244 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);
2245 2346
2246 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2268 2369
2269 if ($t3) { 2370 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2377 glEnd;
2277 } 2378 }
2278 2379
2279 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2281} 2382}
2282 2383
2283############################################################################# 2384#############################################################################
2284 2385
2285package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2286 2387
2287our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2288 2389
2289sub new { 2390sub new {
2290 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2291 2392
2292 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2395 can_hover => 1,
2295 can_events => 1, 2396 can_events => 1,
2296 %arg, 2397 %arg,
2297 ); 2398 );
2298 2399
2299 $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");
2300 $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);
2301 $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");
2302 2403
2303 $self 2404 $self
2304} 2405}
2305 2406
2306sub set_fontsize { 2407sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2328} 2429}
2329 2430
2330############################################################################# 2431#############################################################################
2331 2432
2332package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2333 2434
2334use strict; 2435use strict;
2335 2436
2336use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2337 2438
2338our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2339 2440
2340my @tex = 2441my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2343 2444
2344sub new { 2445sub new {
2345 my $class = shift; 2446 my $class = shift;
2346 2447
… …
2367 $self->update; 2468 $self->update;
2368 2469
2369 $self 2470 $self
2370} 2471}
2371 2472
2372sub changed { }
2373
2374sub set_range { 2473sub set_range {
2375 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2376 2475
2377 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2378 2477
… …
2398 if $unit; 2497 if $unit;
2399 2498
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2500
2402 if ($value != $old_value) { 2501 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2404 $self->update; 2503 $self->update;
2405 } 2504 }
2406} 2505}
2407 2506
2408sub size_request { 2507sub size_request {
2409 my ($self) = @_; 2508 my ($self) = @_;
2410 2509
2411 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2412} 2511}
2413 2512
2414sub button_down { 2513sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2416 2515
2417 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2517
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2519
2421 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2521}
2423 2522
2424sub mouse_motion { 2523sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2426 2525
2427 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2528
… …
2435 } else { 2534 } else {
2436 return 0; 2535 return 0;
2437 } 2536 }
2438 2537
2439 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
2440} 2549}
2441 2550
2442sub update { 2551sub update {
2443 my ($self) = @_; 2552 my ($self) = @_;
2444 2553
… …
2493 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2494} 2603}
2495 2604
2496############################################################################# 2605#############################################################################
2497 2606
2498package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2499 2608
2500our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2501 2610
2502sub new { 2611sub new {
2503 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2504 2613
2505 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2506 2615
2507 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 2619 to_value => sub { shift },
2511 from_value => sub { shift }, 2620 from_value => sub { shift },
2512 %arg, 2621 %arg,
2513 ); 2622 );
2514 2623
… …
2534sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2536 2645
2537############################################################################# 2646#############################################################################
2538 2647
2539package CFClient::UI::TextScroller; 2648package CFPlus::UI::TextScroller;
2540 2649
2541our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2542 2651
2543use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2544 2653
2545sub new { 2654sub new {
2546 my $class = shift; 2655 my $class = shift;
2547 2656
2548 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2549 fontsize => 1, 2658 fontsize => 1,
2550 can_events => 0, 2659 can_events => 1,
2551 indent => 0, 2660 indent => 0,
2552 #font => default_font 2661 #font => default_font
2553 @_, 2662 @_,
2554 2663
2555 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2556 par => [], 2665 par => [],
2557 height => 0, 2666 height => 0,
2558 children => [ 2667 children => [
2559 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2561 ], 2670 ],
2562 ); 2671 );
2563 2672
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2565 2674
… …
2571 2680
2572 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2682 $self->reflow;
2574} 2683}
2575 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
2576sub size_allocate { 2694sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2578 2696
2579 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2699
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2704
2586 $self->reflow; 2705 $self->reflow;
2587}
2588 2706
2589sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2590 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) = @_;
2591 2723
2592 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2593 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 2737 );
2738
2599 $layout->size 2739 $layout
2600} 2740}
2601 2741
2602sub reflow { 2742sub reflow {
2603 my ($self) = @_; 2743 my ($self) = @_;
2604 2744
… …
2613 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2614} 2754}
2615 2755
2616sub clear { 2756sub clear {
2617 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2618 2761
2619 $self->{par} = []; 2762 $self->{par} = [];
2620 $self->{height} = 0; 2763 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2765}
2623 2766
2624sub add_paragraph { 2767sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2626 2769
2627 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2629 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2631 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2632 2780
2633 $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;
2634} 2794}
2635 2795
2636sub update { 2796sub update {
2637 my ($self) = @_; 2797 my ($self) = @_;
2638 2798
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2807
2648 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2809 my $height = 0;
2650 2810
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2815
2662 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2663 } 2819 }
2664 2820
2665 $height += $_->[1]; 2821 $height += $para->{h};
2666 } 2822 }
2667 2823
2668 $self->{height} = $height; 2824 $self->{height} = $height;
2669 2825
2670 $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]);
2671 2827
2672 delete $self->{texture}; 2828 delete $self->{texture};
2673 } 2829 }
2674 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2678 2838
2679 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2680 2840
2681 my $y0 = $top; 2841 my $y0 = $top;
2682 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2683 2843
2684 my $y = 0; 2844 my $y = 0;
2685 2845
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2847 my $h = $para->{h};
2696 2848
2697 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2850
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2704 2852
2705 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2706 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 }
2707 } 2867 }
2708 2868
2709 $y += $h; 2869 $y += $h;
2710 } 2870 }
2711
2712 glDisable GL_BLEND;
2713 }; 2871 };
2714 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2715} 2882}
2716 2883
2717sub _draw { 2884sub _draw {
2718 my ($self) = @_; 2885 my ($self) = @_;
2719 2886
… …
2722 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2725 2892
2726 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2727
2728} 2894}
2729 2895
2730############################################################################# 2896#############################################################################
2731 2897
2732package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2733 2899
2734use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2735 2901
2736our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2737 2903
2738sub moveto { 2904sub moveto {
2739 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2740 2906
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 2935 glPopMatrix;
2770} 2936}
2771 2937
2772############################################################################# 2938#############################################################################
2773 2939
2774package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2775 2941
2776our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2777 2943
2778sub new { 2944sub new {
2779 my $class = shift; 2945 my $class = shift;
2780 2946
2781 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2794} 2960}
2795 2961
2796############################################################################# 2962#############################################################################
2797 2963
2798package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2799 2965
2800our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2801 2967
2802use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2803 2969
2804sub new { 2970sub new {
2805 my $class = shift; 2971 my $class = shift;
2806 2972
2807 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2823 } 2989 }
2824 2990
2825 $tooltip =~ s/^\n+//; 2991 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 2992 $tooltip =~ s/\n+$//;
2827 2993
2828 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 2995 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 2997 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2833 ellipsise => 0, 2999 ellipsise => 0,
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3008
2843 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2844} 3010}
2845 3011
2846sub size_allocate { 3012sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2848 3014
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3016}
2851 3017
2852sub visibility_change { 3018sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2854 3020
2855 return unless $visible; 3021 return unless $visible;
2856 3022
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2859 or return; 3025 or return;
2860 3026
3027 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3029
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2865 3032
2866 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2867 }); 3037 });
2868} 3038}
2869 3039
2870sub _draw { 3040sub _draw {
2871 my ($self) = @_; 3041 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2896} 3066}
2897 3067
2898############################################################################# 3068#############################################################################
2899 3069
2900package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2901 3071
2902our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2903 3073
2904use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2905 3075
2906sub new { 3076sub new {
2907 my $class = shift; 3077 my $class = shift;
2908 3078
2909 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2944sub _draw { 3114sub _draw {
2945 my ($self) = @_; 3115 my ($self) = @_;
2946 3116
2947 return unless $::CONN; 3117 return unless $::CONN;
2948 3118
3119 $self->SUPER::_draw;
3120
2949 my $face; 3121 my $face;
2950 3122
2951 if ($self->{frame}) { 3123 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2953 3125
… …
2975 $self->SUPER::destroy; 3147 $self->SUPER::destroy;
2976} 3148}
2977 3149
2978############################################################################# 3150#############################################################################
2979 3151
2980package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2981 3153
2982our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2983 3155
2984# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2985 3157
2986############################################################################# 3158#############################################################################
2987 3159
2988package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2989 3161
2990our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2991 3163
2992use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2993 3165
2994sub new { 3166sub new {
2995 my $class = shift; 3167 my $class = shift;
2996 3168
2997 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2998 items => [], 3170 items => [],
2999 z => 100, 3171 z => 100,
3000 @_, 3172 @_,
3001 ); 3173 );
3002 3174
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3176
3005 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
3007 3179
3008 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
3009 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3010 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3186 can_hover => 1,
3012 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,
3013 markup => $widget, 3199 markup => $widget,
3014 tooltip => $tooltip 3200 tooltip => $tooltip;
3201 }
3015 } 3202 }
3016 3203
3017 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
3018 3205
3019 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
3024 3211
3025# 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)
3026sub popup { 3213sub popup {
3027 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
3028 3215
3029 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
3030 3217
3031 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3219 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
3034 3221
3035 $self->show; 3222 $self->show;
3036 $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);
3037} 3224}
3038 3225
3039sub mouse_motion { 3226sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
3041 3228
3042 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
3045 3232
3046 0 3233 0
3047} 3234}
3048 3235
3049sub button_up { 3236sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
3051 3238
3052 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3240 undef $GRAB;
3054 $self->hide; 3241 $self->hide;
3055 3242
3056 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3245 } else {
3059 return 0 3246 return 0
3060 } 3247 }
3061 3248
3062 1 3249 1
3063} 3250}
3064 3251
3065############################################################################# 3252#############################################################################
3066 3253
3067package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
3068 3255
3069our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
3070 3257
3071sub new { 3258sub new {
3072 my $class = shift; 3259 my $class = shift;
3073 3260
3074 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
3088 3275
3089 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3091} 3278}
3092 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3093sub set_current_page { 3286sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3095 3288
3096 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3290 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3099 3292
3100 $self->{current} = $widget; 3293 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3295
3103 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3104 3297
3105 $self->realloc; 3298 $self->realloc;
3106} 3299}
3107 3300
3108sub visible_children { 3301sub visible_children {
… …
3113 my ($self) = @_; 3306 my ($self) = @_;
3114 3307
3115 $self->{current}->size_request 3308 $self->{current}->size_request
3116} 3309}
3117 3310
3118sub size_allocate { 3311sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3120 3313
3121 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3122} 3317}
3123 3318
3124sub _draw { 3319sub _draw {
3125 my ($self) = @_; 3320 my ($self) = @_;
3126 3321
3127 $self->{current}->draw; 3322 $self->{current}->draw;
3128} 3323}
3129 3324
3130############################################################################# 3325#############################################################################
3131 3326
3132package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3133 3328
3134our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3135 3330
3136sub new { 3331sub new {
3137 my $class = shift; 3332 my $class = shift;
3138 3333
3139 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3143 @_, 3338 @_,
3144 ); 3339 );
3145 3340
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3152sub add { 3347sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3154 3349
3155 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3156 3351
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3353 markup => $title,
3159 tooltip => $tooltip, 3354 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3356 );
3162 3357
3163 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3164} 3359}
3165 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3166sub set_current_page { 3367sub set_current_page {
3167 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3168 3369
3169 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3372}
3172 3373
3173############################################################################# 3374#############################################################################
3174 3375
3175package CFClient::UI::Combobox; 3376package CFPlus::UI::Selector;
3176 3377
3177use utf8; 3378use utf8;
3178 3379
3179our @ISA = CFClient::UI::Button::; 3380our @ISA = CFPlus::UI::Button::;
3180 3381
3181sub new { 3382sub new {
3182 my $class = shift; 3383 my $class = shift;
3183 3384
3184 my $self = $class->SUPER::new ( 3385 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3391 $self->_set_value ($self->{value});
3191 3392
3192 $self 3393 $self
3193} 3394}
3194 3395
3195sub button_down { 3396sub invoke_button_down {
3196 my ($self, $ev) = @_; 3397 my ($self, $ev) = @_;
3197 3398
3198 my @menu_items; 3399 my @menu_items;
3199 3400
3200 for (@{ $self->{options} }) { 3401 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3402 my ($value, $title, $tooltip) = @$_;
3202 3403
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3405 }
3205 3406
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3408}
3208 3409
3209sub _set_value { 3410sub _set_value {
3210 my ($self, $value) = @_; 3411 my ($self, $value) = @_;
3211 3412
… …
3221 my ($self, $value) = @_; 3422 my ($self, $value) = @_;
3222 3423
3223 return unless $self->{value} ne $value; 3424 return unless $self->{value} ne $value;
3224 3425
3225 $self->_set_value ($value); 3426 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3427 $self->emit (changed => $value);
3227} 3428}
3228 3429
3229############################################################################# 3430#############################################################################
3230 3431
3231package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3232 3433
3233our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3234 3435
3235sub new { 3436sub new {
3236 my $class = shift; 3437 my $class = shift;
3237 3438
3238 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3250sub reorder { 3451sub reorder {
3251 my ($self) = @_; 3452 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3253 3454
3254 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3258 3459
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3462 }
… …
3282 for ($short) { 3483 for ($short) {
3283 s/^\s+//; 3484 s/^\s+//;
3284 s/\s+/ /g; 3485 s/\s+/ /g;
3285 } 3486 }
3286 3487
3287 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3288 markup => $short, 3489 markup => $short,
3289 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 3547 count => 1,
3347 %arg, 3548 %arg,
3348 }; 3549 };
3349 } 3550 }
3350 3551
3552 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3553 $self->reorder;
3554 });
3352} 3555}
3353 3556
3354sub reconfigure { 3557sub reconfigure {
3355 my ($self) = @_; 3558 my ($self) = @_;
3356 3559
… …
3369 $self->SUPER::destroy; 3572 $self->SUPER::destroy;
3370} 3573}
3371 3574
3372############################################################################# 3575#############################################################################
3373 3576
3374package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3375 3578
3376our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3377 3580
3378sub new { 3581sub new {
3379 my $class = shift; 3582 my $class = shift;
3380 3583
3381 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3383 @_, 3587 @_,
3384 ); 3588 );
3385 3589
3590 $self->set_sort_order (undef);
3591
3386 $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;
3387} 3628}
3388 3629
3389sub set_items { 3630sub set_items {
3390 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3391 3632
3392 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3393 return unless $items; 3634 $self->update_items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412} 3635}
3413 3636
3414############################################################################# 3637#############################################################################
3415 3638
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3614 3640
3615our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3616 3642
3617sub new { 3643sub new {
3618 my $class = shift; 3644 my $class = shift;
3619 3645
3620 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3638 "<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");
3639 3665
3640sub rebuild_spell_list { 3666sub rebuild_spell_list {
3641 my ($self) = @_; 3667 my ($self) = @_;
3642 3668
3643 $CFClient::UI::ROOT->on_refresh ($self => sub { 3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear; 3670 $self->clear;
3645 3671
3646 return unless $::CONN; 3672 return unless $::CONN;
3647 3673
3648 $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);
3649 $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);
3650 $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);
3651 $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);
3652 $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);
3653 3679
3654 my $row = 0; 3680 my $row = 0;
3655 3681
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_}; 3683 my $spell = $self->{spell}{$_};
… …
3664 if ($ev->{button} == 1) { 3690 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}"); 3691 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) { 3692 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}"); 3693 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) { 3694 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu 3695 (new CFPlus::UI::Menu
3670 items => [ 3696 items => [
3671 ["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}"]) }],
3672 ["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}"]) }],
3673 ], 3699 ],
3674 )->popup ($ev); 3700 )->popup ($ev);
3675 } else { 3701 } else {
3676 return 0; 3702 return 0;
… …
3680 }; 3706 };
3681 3707
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683 3709
3684 #TODO: add path info to tooltip 3710 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3686 3712
3687 $self->add (0, $row, new CFClient::UI::Face 3713 $self->add (0, $row, new CFPlus::UI::Face
3688 face => $spell->{face}, 3714 face => $spell->{face},
3689 can_hover => 1, 3715 can_hover => 1,
3690 can_events => 1, 3716 can_events => 1,
3691 tooltip => $tooltip, 3717 tooltip => $tooltip,
3692 on_button_down => $spell_cb, 3718 on_button_down => $spell_cb,
3693 ); 3719 );
3694 3720
3695 $self->add (1, $row, new CFClient::UI::Label 3721 $self->add (1, $row, new CFPlus::UI::Label
3696 expand => 1, 3722 expand => 1,
3697 text => $spell->{name}, 3723 text => $spell->{name},
3698 can_hover => 1, 3724 can_hover => 1,
3699 can_events => 1, 3725 can_events => 1,
3700 tooltip => $tooltip, 3726 tooltip => $tooltip,
3701 on_button_down => $spell_cb, 3727 on_button_down => $spell_cb,
3702 ); 3728 );
3703 3729
3704 $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);
3705 $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);
3706 $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);
3707 $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);
3708 } 3734 }
3709 }); 3735 });
3710} 3736}
3711 3737
3712sub add_spell { 3738sub add_spell {
… …
3730 $self->rebuild_spell_list; 3756 $self->rebuild_spell_list;
3731} 3757}
3732 3758
3733############################################################################# 3759#############################################################################
3734 3760
3735package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3736 3762
3737our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3738 3764
3739use List::Util qw(min max); 3765use List::Util qw(min max);
3740 3766
3741use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3742 3768
3743sub new { 3769sub new {
3744 my $class = shift; 3770 my $class = shift;
3745 3771
3746 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3771 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3772 3798
3773 int $coord + 0.5 3799 int $coord + 0.5
3774} 3800}
3775 3801
3776sub size_allocate { 3802sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3778 3804
3779 for my $child ($self->children) { 3805 for my $child ($self->children) {
3780 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)};
3781 3807
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3787 3813
3788 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3789 } 3815 }
3816
3817 1
3790} 3818}
3791 3819
3792sub coord2local { 3820sub coord2local {
3793 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3794 3822
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3949
3922 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3924 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
3925 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3927 3964
3928 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}) {
3929 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 3991 glLoadIdentity;
3955 3992
3956 { 3993 {
3957 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3958 3995
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3961 } 3998 }
3962 3999
3963 $self->_draw; 4000 $self->_draw;
3964} 4001}
3965 4002
3966############################################################################# 4003#############################################################################
3967 4004
3968package CFClient::UI; 4005package CFPlus::UI;
3969 4006
3970$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4009
39731 40101
3974 4011

Diff Legend

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