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

Diff Legend

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