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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.358 by root, Fri Dec 8 14:59:54 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
… …
272 295
273 return unless $self->{visible}; 296 return unless $self->{visible};
274 297
275 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
276 299
300 delete $self->{visible};
277 delete $self->{root}; 301 delete $self->{root};
278 delete $self->{visible};
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 do not like duplication
520 # and needlessly verbose code, either.
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 #$self->deactivate;
599}
600 644
601############################################################################# 645 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
647}
602 648
649#############################################################################
650
603package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
604 652
605our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
606 654
607use strict; 655use strict;
608use CFClient::OpenGL; 656use CFPlus::OpenGL;
609 657
610sub new { 658sub new {
611 my $class = shift; 659 my $class = shift;
612 660
613 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
644 } 692 }
645} 693}
646 694
647############################################################################# 695#############################################################################
648 696
649package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
650 698
651our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
652 700
653sub new { 701sub new {
654 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
656} 704}
… …
663 711
664sub draw { } 712sub draw { }
665 713
666############################################################################# 714#############################################################################
667 715
668package CFClient::UI::Container; 716package CFPlus::UI::Container;
669 717
670our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
671 719
672sub new { 720sub new {
673 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
674 722
675 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
684 if $children; 732 if $children;
685 733
686 $self 734 $self
687} 735}
688 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
689sub add { 745sub add {
690 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
691 747
692 $_->set_parent ($self) 748 $_->set_parent ($self)
693 for @widgets; 749 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
754} 810}
755 811
756############################################################################# 812#############################################################################
757 813
758package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
759 815
760our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
761 817
762sub new { 818sub new {
763 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
764 820
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 822
767 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
768} 824}
769 825
770sub add { 826sub add {
771 my ($self, $child) = @_; 827 my ($self, $child) = @_;
772 828
773 $self->{children} = []; 829 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
776} 831}
777 832
778sub remove { 833sub remove {
779 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
780 835
781 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
782 837
783 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 839 unless @{$self->{children}};
785} 840}
786 841
787sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
788 843
789sub size_request { 844sub size_request {
790 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
791} 846}
792 847
793sub size_allocate { 848sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
795 850
796 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
797} 854}
798 855
799############################################################################# 856#############################################################################
800 857
801# back-buffered drawing area 858# back-buffered drawing area
802 859
803package CFClient::UI::Window; 860package CFPlus::UI::Window;
804 861
805our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
806 863
807use CFClient::OpenGL; 864use CFPlus::OpenGL;
808 865
809sub new { 866sub new {
810 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
811 868
812 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
817 874
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 876 $self->SUPER::update;
820} 877}
821 878
822sub size_allocate { 879sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
824 881
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
827} 885}
828 886
829sub _render { 887sub _render {
830 my ($self) = @_; 888 my ($self) = @_;
831 889
… …
833} 891}
834 892
835sub render_child { 893sub render_child {
836 my ($self) = @_; 894 my ($self) = @_;
837 895
838 $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 {
839 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
841 899
842 { 900 {
843 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
844 902
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
847 } 907 }
848
849 $self->_render;
850 }; 908 };
851} 909}
852 910
853sub _draw { 911sub _draw {
854 my ($self) = @_; 912 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 913
858 my $tex = $self->{texture} 914 my $tex = $self->{texture}
859 or return; 915 or return;
860 916
861 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
864 920
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
866 922
867 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
868} 924}
869 925
870############################################################################# 926#############################################################################
871 927
872package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
873 929
874our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 969
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 997 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 999 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1001 }
944} 1002}
945 1003
946sub _render { 1004sub _render {
947 my ($self) = @_; 1005 my ($self) = @_;
948 1006
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1009
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1011
954 $self->SUPER::_render; 1012 $self->SUPER::_render;
955} 1013}
956 1014
957############################################################################# 1015#############################################################################
958 1016
959package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
960 1018
961our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
962 1020
963sub new { 1021sub new {
964 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
965 1023
966 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
967 1025
968 my $self; 1026 my $self;
969 1027
970 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1029 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1031 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
975 }, 1033 },
976 ; 1034 ;
977 1035
978 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
980 slider => $slider, 1039 slider => $slider,
981 %arg, 1040 %arg,
982 ); 1041 );
983 1042
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
986 1045
987 $self 1046 $self
988} 1047}
989 1048
1049#TODO# update range on size_allocate depending on child
1050
990sub add { 1051sub add {
991 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
992 1053
993 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
994} 1055}
995 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
996sub update { 1073sub update {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
999 $self->SUPER::update; 1076 $self->SUPER::update;
1000 1077
1001 # todo: overwrite size_allocate of child 1078 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1079}
1005 1080
1006sub size_allocate { 1081sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1008 1083
1084 $self->update_slider;
1085
1009 $self->SUPER::size_allocate ($w, $h); 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1087}
1014 1088
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017
1018############################################################################# 1089#############################################################################
1019 1090
1020package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1021 1092
1022our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1023 1094
1024use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1025 1096
1026sub new { 1097sub new {
1027 my $class = shift; 1098 my $class = shift;
1028 1099
1029 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1056} 1127}
1057 1128
1058############################################################################# 1129#############################################################################
1059 1130
1060package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1061 1132
1062our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1063 1134
1064use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1136
1074sub new { 1137sub new {
1075 my ($class, %arg) = @_; 1138 my ($class, %arg) = @_;
1076 1139
1077 my $title = delete $arg{title}; 1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1078 1247
1079 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1251 border => 0.6,
1083 can_events => 1, 1252 can_events => 1,
1084 min_w => 16, 1253 min_w => 64,
1085 min_h => 16, 1254 min_h => 32,
1086 %arg, 1255 %arg,
1087 ); 1256 );
1088 1257
1089 $self->{title} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1259 align => 0,
1091 valign => 1, 1260 valign => 1,
1092 text => $title, 1261 text => $self->{title},
1093 fontsize => $self->{border} 1262 fontsize => $self->{border},
1094 if defined $title; 1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1095 1273
1096 $self 1274 $self
1097} 1275}
1098 1276
1099sub add { 1277sub add {
1100 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1101 1279
1102 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1283}
1105 1284
1106sub border { 1285sub border {
1107 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1108} 1287}
1109 1288
1110sub size_request { 1289sub size_request {
1111 my ($self) = @_; 1290 my ($self) = @_;
1112 1291
1113 $self->{title}->size_request 1292 $self->{title_widget}->size_request
1114 if $self->{title}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1115 1297
1116 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1117 1299
1118 ( 1300 (
1119 $w + $self->border * 2, 1301 $w + $self->border * 2,
1120 $h + $self->border * 2, 1302 $h + $self->border * 2,
1121 ) 1303 )
1122} 1304}
1123 1305
1124sub size_allocate { 1306sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1126 1308
1127 if ($self->{title}) { 1309 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1313 }
1132 1314
1133 my $border = $self->border; 1315 my $border = $self->border;
1134 1316
1135 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1137 1332
1138 $self->child->configure ($border, $border, $w, $h); 1333 1
1139} 1334}
1140 1335
1141sub button_down { 1336sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1143 1338
1144 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1340 my $border = $self->border;
1146 1341
… …
1177 1372
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1374
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1378 };
1184 } else { 1379 } else {
1185 return 0; 1380 return 0;
1186 } 1381 }
1187 1382
1188 1 1383 1
1189} 1384}
1190 1385
1191sub button_up { 1386sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1193 1388
1194 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1195} 1390}
1196 1391
1197sub mouse_motion { 1392sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1199 1394
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1396
1202 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1203} 1406}
1204 1407
1205sub _draw { 1408sub _draw {
1206 my ($self) = @_; 1409 my ($self) = @_;
1207 1410
… …
1233 1436
1234 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1235 1438
1236 $child->draw; 1439 $child->draw;
1237 1440
1238 if ($self->{title}) { 1441 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1443 $self->{title_widget}->_draw;
1241 }
1242}
1243 1444
1244############################################################################# 1445 glTranslate 0, - ($border - $self->{h});
1446 }
1245 1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1450}
1451
1452#############################################################################
1453
1246package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1247 1455
1248our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1249 1457
1250use List::Util qw(max sum); 1458use List::Util qw(max sum);
1251 1459
1252use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1253 1461
1254sub new { 1462sub new {
1255 my $class = shift; 1463 my $class = shift;
1256 1464
1257 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1263sub children { 1471sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1473}
1266 1474
1267sub add { 1475sub add {
1268 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1269 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1480 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1272 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1274} 1493}
1275 1494
1276# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1496sub clear {
1278 my ($self) = @_; 1497 my ($self) = @_;
… …
1319 (sum @$ws), 1538 (sum @$ws),
1320 (sum @$hs), 1539 (sum @$hs),
1321 ) 1540 )
1322} 1541}
1323 1542
1324sub size_allocate { 1543sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1326 1545
1327 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1328 1547
1329 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1336 1555
1337 # linearly scale sizes 1556 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1559
1341 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1343 1562
1344 my $y; 1563 my $y;
1345 1564
1346 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1361 } 1580 }
1362 1581
1363 $y += $row_h; 1582 $y += $row_h;
1364 } 1583 }
1365 1584
1585 1
1366} 1586}
1367 1587
1368sub find_widget { 1588sub find_widget {
1369 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1370 1590
… …
1389 } 1609 }
1390} 1610}
1391 1611
1392############################################################################# 1612#############################################################################
1393 1613
1394package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1395 1615
1396our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1397 1617
1398sub size_request { 1618sub size_request {
1399 my ($self) = @_; 1619 my ($self) = @_;
1400 1620
1401 $self->{vertical} 1621 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1629 )
1410} 1630}
1411 1631
1412sub size_allocate { 1632sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1414 1634
1415 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1417 1637
1418 my @req; 1638 my @req;
1419 1639
1420 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1422 } else { 1642 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1425 1645
1426 if ($req > $space) { 1646 if ($req > $space) {
1427 # ah well, not enough space 1647 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1429 } else { 1649 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1651
1432 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1433 1653
1434 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1655 for 0 .. $#children;
1436 } 1656 }
1437 } 1657 }
1438 1658
1439 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1440 1660
1441 my $pos = 0; 1661 my $pos = 0;
1442 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1665
1446 $pos += $alloc; 1666 $pos += $alloc;
1447 } 1667 }
1448 1668
1449 1 1669 1
1450} 1670}
1451 1671
1452############################################################################# 1672#############################################################################
1453 1673
1454package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1455 1675
1456our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1457 1677
1458sub new { 1678sub new {
1459 my $class = shift; 1679 my $class = shift;
1460 1680
1461 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1464 ) 1684 )
1465} 1685}
1466 1686
1467############################################################################# 1687#############################################################################
1468 1688
1469package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1470 1690
1471our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1472 1692
1473sub new { 1693sub new {
1474 my $class = shift; 1694 my $class = shift;
1475 1695
1476 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1479 ) 1699 )
1480} 1700}
1481 1701
1482############################################################################# 1702#############################################################################
1483 1703
1484package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1485 1705
1486our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1487 1707
1488use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1489 1709
1490sub new { 1710sub new {
1491 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1492 1712
1493 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1716 #active_bg => none
1497 #font => default_font 1717 #font => default_font
1498 #text => initial text 1718 #text => initial text
1499 #markup => initial narkup 1719 #markup => initial narkup
1500 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1501 ellipsise => 3, # end 1722 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1724 fontsize => 1,
1504 align => -1, 1725 align => -1,
1505 valign => -1, 1726 valign => -1,
1506 padding_x => 2, 1727 padding_x => 2,
1507 padding_y => 2, 1728 padding_y => 2,
1508 can_events => 0, 1729 can_events => 0,
1509 %arg 1730 %arg
1510 ); 1731 );
1511 1732
1512 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1736 $self->{template} = $layout;
1516 } 1737 }
1517 1738
1518 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1522 } 1743 }
1523 1744
1524 $self 1745 $self
1525} 1746}
1526 1747
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1748sub update {
1538 my ($self) = @_; 1749 my ($self) = @_;
1539 1750
1540 delete $self->{texture}; 1751 delete $self->{texture};
1541 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1556 1767
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1559 1769
1560 delete $self->{size_req}; 1770 delete $self->{size_req};
1561 $self->realloc; 1771 $self->realloc;
1562 $self->update; 1772 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1570 1780
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1782
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1575 1784
1576 delete $self->{size_req}; 1785 delete $self->{size_req};
1577 $self->realloc; 1786 $self->realloc;
1578 $self->update; 1787 $self->update;
… …
1590 1799
1591 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1592 1801
1593 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1806
1597 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1598 1808
1599 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
… …
1604 }; 1814 };
1605 1815
1606 @{ $self->{size_req} } 1816 @{ $self->{size_req} }
1607} 1817}
1608 1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1609sub size_allocate { 1823sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1611 1825
1612 delete $self->{ox}; 1826 delete $self->{ox};
1613 1827
1614 delete $self->{texture} 1828 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1616} 1832}
1617 1833
1618sub set_fontsize { 1834sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1620 1836
1621 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1622 delete $self->{texture}; 1839 delete $self->{texture};
1623 1840
1624 $self->realloc; 1841 $self->realloc;
1625} 1842}
1626 1843
1627sub reconfigure { 1844sub reconfigure {
1628 my ($self) = @_; 1845 my ($self) = @_;
1629 1846
1630 delete $self->{size_req}; 1847 delete $self->{size_req};
1848 delete $self->{texture};
1631 1849
1632 $self->SUPER::reconfigure; 1850 $self->SUPER::reconfigure;
1633} 1851}
1634 1852
1635sub _draw { 1853sub _draw {
1636 my ($self) = @_; 1854 my ($self) = @_;
1637 1855
1638 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1639 1857
1640 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1865
1648 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1649 }; 1867 };
1650 1868
1651 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1655 1873
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1877 };
1660 1878
1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 1881
1666 if ($tex->{format} == GL_ALPHA) { 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 1883}
1677 1884
1678############################################################################# 1885#############################################################################
1679 1886
1680package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1681 1888
1682our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1683 1890
1684use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1685 1892
1686sub new { 1893sub new {
1687 my $class = shift; 1894 my $class = shift;
1688 1895
1689 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1693 active_fg => [0, 0, 0], 1900 active_fg => [0, 0, 0],
1694 can_hover => 1, 1901 can_hover => 1,
1695 can_focus => 1, 1902 can_focus => 1,
1696 valign => 0, 1903 valign => 0,
1697 can_events => 1, 1904 can_events => 1,
1905 ellipsise => 0,
1698 #text => ... 1906 #text => ...
1699 #hidden => "*", 1907 #hidden => "*",
1700 @_ 1908 @_
1701 ) 1909 )
1702} 1910}
… …
1713 1921
1714 $text =~ s/./*/g if $self->{hidden}; 1922 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1923 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1924 delete $self->{size_req};
1717 1925
1718 $self->_emit (changed => $self->{text}); 1926 $self->emit (changed => $self->{text});
1719 1927
1720 $self->realloc; 1928 $self->realloc;
1721 $self->update; 1929 $self->update;
1722} 1930}
1723 1931
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1946 my ($w, $h) = $self->SUPER::size_request;
1739 1947
1740 ($w + 1, $h) # add 1 for cursor 1948 ($w + 1, $h) # add 1 for cursor
1741} 1949}
1742 1950
1743sub key_down { 1951sub invoke_key_down {
1744 my ($self, $ev) = @_; 1952 my ($self, $ev) = @_;
1745 1953
1746 my $mod = $ev->{mod}; 1954 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1955 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1956 my $uni = $ev->{unicode};
… …
1751 1959
1752 if ($uni == 8) { 1960 if ($uni == 8) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 1962 } elsif ($uni == 127) {
1755 substr $text, $self->{cursor}, 1, ""; 1963 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 1964 } elsif ($sym == CFPlus::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 1965 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 1966 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1967 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1968 } elsif ($sym == CFPlus::SDLK_HOME) {
1761 $self->{cursor} = 0; 1969 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1970 } elsif ($sym == CFPlus::SDLK_END) {
1763 $self->{cursor} = length $text; 1971 $self->{cursor} = length $text;
1972 } elsif ($uni == 21) { # ctrl-u
1973 $text = "";
1974 $self->{cursor} = 0;
1764 } elsif ($uni == 27) { 1975 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1976 $self->emit ('escape');
1766 } elsif ($uni) { 1977 } elsif ($uni >= 0x20) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1978 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1979 } else {
1769 return 0; 1980 return 0;
1770 } 1981 }
1771 1982
1772 $self->_set_text ($text); 1983 $self->_set_text ($text);
1773 1984
1774 $self->realloc; 1985 $self->realloc;
1986 $self->update;
1775 1987
1776 1 1988 1
1777} 1989}
1778 1990
1779sub focus_in { 1991sub invoke_focus_in {
1780 my ($self) = @_; 1992 my ($self) = @_;
1781 1993
1782 $self->{last_activity} = $::NOW; 1994 $self->{last_activity} = $::NOW;
1783 1995
1784 $self->SUPER::focus_in; 1996 $self->SUPER::invoke_focus_in
1785} 1997}
1786 1998
1787sub button_down { 1999sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 2000 my ($self, $ev, $x, $y) = @_;
1789 2001
1790 $self->SUPER::button_down ($ev, $x, $y); 2002 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 2003
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 2004 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 2005
1794 # byte-index to char-index 2006 # byte-index to char-index
1795 my $text = $self->{text}; 2007 my $text = $self->{text};
1796 utf8::encode $text; 2008 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 2009 $self->{cursor} = length $text;
1798 2010
1799 $self->_set_text ($self->{text}); 2011 $self->_set_text ($self->{text});
1800 $self->update; 2012 $self->update;
1801 2013
1802 1 2014 1
1803} 2015}
1804 2016
1805sub mouse_motion { 2017sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 2018 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2019# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 2020
1809 0 2021 1
1810} 2022}
1811 2023
1812sub _draw { 2024sub _draw {
1813 my ($self) = @_; 2025 my ($self) = @_;
1814 2026
… …
1841 utf8::encode $text; 2053 utf8::encode $text;
1842 2054
1843 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1844 } 2056 }
1845 2057
1846 glColor @{$self->{fg}};
1847 glBegin GL_LINES; 2058 glBegin GL_LINES;
1848 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2059 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1849 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850 glEnd; 2061 glEnd;
1851 } 2062 }
1852} 2063}
1853 2064
2065#############################################################################
2066
1854package CFClient::UI::Entry; 2067package CFPlus::UI::Entry;
1855 2068
1856our @ISA = CFClient::UI::EntryBase::; 2069our @ISA = CFPlus::UI::EntryBase::;
1857 2070
1858use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1859 2072
1860sub key_down { 2073sub invoke_key_down {
1861 my ($self, $ev) = @_; 2074 my ($self, $ev) = @_;
1862 2075
1863 my $sym = $ev->{sym}; 2076 my $sym = $ev->{sym};
1864 2077
1865 if ($sym == 13) { 2078 if ($sym == 13) {
1866 unshift @{$self->{history}}, 2079 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 2080 my $txt = $self->get_text;
2081
1868 $self->{history_pointer} = -1; 2082 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 2083 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 2084 $self->emit (activate => $txt);
1871 $self->update; 2085 $self->update;
1872 2086
1873 } elsif ($sym == CFClient::SDLK_UP) { 2087 } elsif ($sym == CFPlus::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 2088 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 2089 $self->{history_saveback} = $self->get_text;
1876 } 2090 }
1877 if (@{$self->{history} || []} > 0) { 2091 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 2092 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 2094 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 2095 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2096 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 2097 }
1884 2098
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 2099 } elsif ($sym == CFPlus::SDLK_DOWN) {
1886 $self->{history_pointer}--; 2100 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2101 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 2102
1889 if ($self->{history_pointer} >= 0) { 2103 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2104 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2105 } else {
1892 $self->set_text ($self->{history_saveback}); 2106 $self->set_text ($self->{history_saveback});
1893 } 2107 }
1894 2108
1895 } else { 2109 } else {
1896 return $self->SUPER::key_down ($ev) 2110 return $self->SUPER::invoke_key_down ($ev)
1897 } 2111 }
1898 2112
1899 1 2113 1
1900} 2114}
1901 2115
1902############################################################################# 2116#############################################################################
1903 2117
2118package CFPlus::UI::TextEdit;
2119
2120our @ISA = CFPlus::UI::EntryBase::;
2121
2122use CFPlus::OpenGL;
2123
2124sub move_cursor_ver {
2125 my ($self, $dy) = @_;
2126
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128
2129 do {
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) {
2131 $self->{cursor} = $index;
2132 delete $self->{cur_h};
2133 $self->update;
2134 return;
2135 }
2136 } while --$x >= 0;
2137}
2138
2139sub invoke_key_down {
2140 my ($self, $ev) = @_;
2141
2142 my $sym = $ev->{sym};
2143
2144 if ($sym == CFPlus::SDLK_UP) {
2145 $self->move_cursor_ver (-1);
2146 } elsif ($sym == CFPlus::SDLK_DOWN) {
2147 $self->move_cursor_ver (+1);
2148 } else {
2149 return $self->SUPER::invoke_key_down ($ev)
2150 }
2151
2152 1
2153}
2154
2155#############################################################################
2156
1904package CFClient::UI::Button; 2157package CFPlus::UI::Button;
1905 2158
1906our @ISA = CFClient::UI::Label::; 2159our @ISA = CFPlus::UI::Label::;
1907 2160
1908use CFClient::OpenGL; 2161use CFPlus::OpenGL;
1909 2162
1910my @tex = 2163my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png); 2165 qw(b1_button_active.png);
1913 2166
1914sub new { 2167sub new {
1915 my $class = shift; 2168 my $class = shift;
1916 2169
… …
1925 can_events => 1, 2178 can_events => 1,
1926 @_ 2179 @_
1927 ) 2180 )
1928} 2181}
1929 2182
1930sub activate { }
1931
1932sub button_up { 2183sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2184 my ($self, $ev, $x, $y) = @_;
1934 2185
1935 $self->emit ("activate") 2186 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2187 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2188 && $y >= 0 && $y < $self->{h};
… …
1955 $self->SUPER::_draw; 2206 $self->SUPER::_draw;
1956} 2207}
1957 2208
1958############################################################################# 2209#############################################################################
1959 2210
1960package CFClient::UI::CheckBox; 2211package CFPlus::UI::CheckBox;
1961 2212
1962our @ISA = CFClient::UI::DrawBG::; 2213our @ISA = CFPlus::UI::DrawBG::;
1963 2214
1964my @tex = 2215my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2216 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2217 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2218
1968use CFClient::OpenGL; 2219use CFPlus::OpenGL;
1969 2220
1970sub new { 2221sub new {
1971 my $class = shift; 2222 my $class = shift;
1972 2223
1973 $class->SUPER::new ( 2224 $class->SUPER::new (
… …
1987 my ($self) = @_; 2238 my ($self) = @_;
1988 2239
1989 (6) x 2 2240 (6) x 2
1990} 2241}
1991 2242
2243sub toggle {
2244 my ($self) = @_;
2245
2246 $self->{state} = !$self->{state};
2247 $self->emit (changed => $self->{state});
2248 $self->update;
2249}
2250
1992sub button_down { 2251sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2252 my ($self, $ev, $x, $y) = @_;
1994 2253
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2254 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2255 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2256 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2257 } else {
2000 return 0 2258 return 0
2001 } 2259 }
2002 2260
2003 1 2261 1
… …
2023 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2024} 2282}
2025 2283
2026############################################################################# 2284#############################################################################
2027 2285
2028package CFClient::UI::Image; 2286package CFPlus::UI::Image;
2029 2287
2030our @ISA = CFClient::UI::Base::; 2288our @ISA = CFPlus::UI::Base::;
2031 2289
2032use CFClient::OpenGL; 2290use CFPlus::OpenGL;
2033use Carp qw/confess/;
2034 2291
2035our %loaded_images; 2292our %texture_cache;
2036 2293
2037sub new { 2294sub new {
2038 my $class = shift; 2295 my $class = shift;
2039 2296
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2297 my $self = $class->SUPER::new (
2298 can_events => 0,
2299 @_,
2300 );
2041 2301
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2302 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required";
2043 2304
2044 $loaded_images{$self->{image}} ||= 2305 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2046 2307
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2308 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2309
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2311
2053 $self 2312 $self
2054} 2313}
2055 2314
2315sub STORABLE_freeze {
2316 my ($self, $cloning) = @_;
2317
2318 $self->{path}
2319 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2320
2321 $self->{path}
2322}
2323
2324sub STORABLE_attach {
2325 my ($self, $cloning, $path) = @_;
2326
2327 $self->new (path => $path)
2328}
2329
2056sub size_request { 2330sub size_request {
2057 my ($self) = @_; 2331 my ($self) = @_;
2058 2332
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2333 ($self->{tex}{w}, $self->{tex}{h})
2060} 2334}
2061 2335
2062sub _draw { 2336sub _draw {
2063 my ($self) = @_; 2337 my ($self) = @_;
2064 2338
… …
2074 } 2348 }
2075 2349
2076 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078 2352
2079 $tex->draw_quad_alpha (0, 0, $w, $h); 2353 $tex->draw_quad (0, 0, $w, $h);
2080 2354
2081 glDisable GL_TEXTURE_2D; 2355 glDisable GL_TEXTURE_2D;
2082} 2356}
2083 2357
2084############################################################################# 2358#############################################################################
2085 2359
2360package CFPlus::UI::ImageButton;
2361
2362our @ISA = CFPlus::UI::Image::;
2363
2364use CFPlus::OpenGL;
2365
2366my %textures;
2367
2368sub new {
2369 my $class = shift;
2370
2371 my $self = $class->SUPER::new (
2372 padding_x => 4,
2373 padding_y => 4,
2374 fg => [1, 1, 1],
2375 active_fg => [0, 0, 1],
2376 can_hover => 1,
2377 align => 0,
2378 valign => 0,
2379 can_events => 1,
2380 @_
2381 );
2382}
2383
2384sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_;
2386
2387 $self->emit ("activate")
2388 if $x >= 0 && $x < $self->{w}
2389 && $y >= 0 && $y < $self->{h};
2390
2391 1
2392}
2393
2394#############################################################################
2395
2086package CFClient::UI::VGauge; 2396package CFPlus::UI::VGauge;
2087 2397
2088our @ISA = CFClient::UI::Base::; 2398our @ISA = CFPlus::UI::Base::;
2089 2399
2090use List::Util qw(min max); 2400use List::Util qw(min max);
2091 2401
2092use CFClient::OpenGL; 2402use CFPlus::OpenGL;
2093 2403
2094my %tex = ( 2404my %tex = (
2095 food => [ 2405 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2406 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2407 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2408 ],
2099 grace => [ 2409 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2410 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2411 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102 ], 2412 ],
2103 hp => [ 2413 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2414 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2415 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2416 ],
2107 mana => [ 2417 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2419 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110 ], 2420 ],
2111); 2421);
2112 2422
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2423# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2483 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2484 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2485
2176 my $h1 = $self->{h} * (1 - $ycut1); 2486 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2487 my $h2 = $self->{h} * (1 - $ycut2);
2488 my $h3 = $self->{h};
2489
2490 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2491
2179 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2493 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2494 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
… …
2201 2514
2202 if ($t3) { 2515 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2516 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2517 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2518 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2519 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2520 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2521 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2522 glEnd;
2210 } 2523 }
2211 2524
2212 glDisable GL_BLEND; 2525 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2526 glDisable GL_TEXTURE_2D;
2214} 2527}
2215 2528
2216############################################################################# 2529#############################################################################
2217 2530
2218package CFClient::UI::Gauge; 2531package CFPlus::UI::Gauge;
2219 2532
2220our @ISA = CFClient::UI::VBox::; 2533our @ISA = CFPlus::UI::VBox::;
2221 2534
2222sub new { 2535sub new {
2223 my ($class, %arg) = @_; 2536 my ($class, %arg) = @_;
2224 2537
2225 my $self = $class->SUPER::new ( 2538 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2540 can_hover => 1,
2228 can_events => 1, 2541 can_events => 1,
2229 %arg, 2542 %arg,
2230 ); 2543 );
2231 2544
2232 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2545 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2233 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2546 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2234 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2547 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2235 2548
2236 $self 2549 $self
2237} 2550}
2238 2551
2239sub set_fontsize { 2552sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 2573 $self->{value}->set_text ($val);
2261} 2574}
2262 2575
2263############################################################################# 2576#############################################################################
2264 2577
2265package CFClient::UI::Slider; 2578package CFPlus::UI::Slider;
2266 2579
2267use strict; 2580use strict;
2268 2581
2269use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2270 2583
2271our @ISA = CFClient::UI::DrawBG::; 2584our @ISA = CFPlus::UI::DrawBG::;
2272 2585
2273my @tex = 2586my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2587 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 2588 qw(s1_slider.png s1_slider_bg.png);
2276 2589
2277sub new { 2590sub new {
2278 my $class = shift; 2591 my $class = shift;
2279 2592
… …
2300 $self->update; 2613 $self->update;
2301 2614
2302 $self 2615 $self
2303} 2616}
2304 2617
2305sub changed { }
2306
2307sub set_range { 2618sub set_range {
2308 my ($self, $range) = @_; 2619 my ($self, $range) = @_;
2309 2620
2310 ($range, $self->{range}) = ($self->{range}, $range); 2621 ($range, $self->{range}) = ($self->{range}, $range);
2311 2622
… …
2331 if $unit; 2642 if $unit;
2332 2643
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2644 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2645
2335 if ($value != $old_value) { 2646 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2647 $self->emit (changed => $value);
2337 $self->update; 2648 $self->update;
2338 } 2649 }
2339} 2650}
2340 2651
2341sub size_request { 2652sub size_request {
2342 my ($self) = @_; 2653 my ($self) = @_;
2343 2654
2344 ($self->{req_w}, $self->{req_h}) 2655 ($self->{req_w}, $self->{req_h})
2345} 2656}
2346 2657
2347sub button_down { 2658sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2349 2660
2350 $self->SUPER::button_down ($ev, $x, $y); 2661 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2662
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2663 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2664
2354 $self->mouse_motion ($ev, $x, $y) 2665 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2666}
2356 2667
2357sub mouse_motion { 2668sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2669 my ($self, $ev, $x, $y) = @_;
2359 2670
2360 if ($GRAB == $self) { 2671 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2672 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2673
… …
2368 } else { 2679 } else {
2369 return 0; 2680 return 0;
2370 } 2681 }
2371 2682
2372 1 2683 1
2684}
2685
2686sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_;
2688
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2692
2693 ! ! $delta
2373} 2694}
2374 2695
2375sub update { 2696sub update {
2376 my ($self) = @_; 2697 my ($self) = @_;
2377 2698
… …
2426 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
2427} 2748}
2428 2749
2429############################################################################# 2750#############################################################################
2430 2751
2431package CFClient::UI::ValSlider; 2752package CFPlus::UI::ValSlider;
2432 2753
2433our @ISA = CFClient::UI::HBox::; 2754our @ISA = CFPlus::UI::HBox::;
2434 2755
2435sub new { 2756sub new {
2436 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
2437 2758
2438 my $range = delete $arg{range}; 2759 my $range = delete $arg{range};
2439 2760
2440 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2762 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2763 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift }, 2764 to_value => sub { shift },
2444 from_value => sub { shift }, 2765 from_value => sub { shift },
2445 %arg, 2766 %arg,
2446 ); 2767 );
2447 2768
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2788sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2789sub set_value { shift->{slider}->set_value (@_) }
2469 2790
2470############################################################################# 2791#############################################################################
2471 2792
2472package CFClient::UI::TextView; 2793package CFPlus::UI::TextScroller;
2473 2794
2474our @ISA = CFClient::UI::HBox::; 2795our @ISA = CFPlus::UI::HBox::;
2475 2796
2476use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2477 2798
2478sub new { 2799sub new {
2479 my $class = shift; 2800 my $class = shift;
2480 2801
2481 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2482 fontsize => 1, 2803 fontsize => 1,
2483 can_events => 0, 2804 can_events => 1,
2484 indent => 0, 2805 indent => 0,
2485 #font => default_font 2806 #font => default_font
2486 @_, 2807 @_,
2487 2808
2488 layout => (new CFClient::Layout 1), 2809 layout => (new CFPlus::Layout),
2489 par => [], 2810 par => [],
2490 height => 0, 2811 height => 0,
2491 children => [ 2812 children => [
2492 (new CFClient::UI::Empty expand => 1), 2813 (new CFPlus::UI::Empty expand => 1),
2493 (new CFClient::UI::Slider vertical => 1), 2814 (new CFPlus::UI::Slider vertical => 1),
2494 ], 2815 ],
2495 ); 2816 );
2496 2817
2497 $self->{children}[1]->connect (changed => sub { $self->update }); 2818 $self->{children}[1]->connect (changed => sub { $self->update });
2498 2819
… …
2504 2825
2505 $self->{fontsize} = $fontsize; 2826 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2827 $self->reflow;
2507} 2828}
2508 2829
2830sub size_request {
2831 my ($self) = @_;
2832
2833 my ($empty, $slider) = @{ $self->{children} };
2834
2835 local $self->{children} = [$empty, $slider];
2836 $self->SUPER::size_request
2837}
2838
2509sub size_allocate { 2839sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2511 2841
2512 $self->SUPER::size_allocate ($w, $h); 2842 my ($empty, $slider, @other) = @{ $self->{children} };
2843 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2844
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2845 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2846 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2847 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2848 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2849
2519 $self->reflow; 2850 $self->reflow;
2520}
2521 2851
2522sub text_size { 2852 local $self->{children} = [$empty, $slider];
2853 $self->SUPER::invoke_size_allocate ($w, $h)
2854}
2855
2856sub invoke_mouse_wheel {
2523 my ($self, $text, $indent) = @_; 2857 my ($self, $ev) = @_;
2858
2859 return 0 unless $ev->{dy}; # only vertical movements
2860
2861 $self->{children}[1]->emit (mouse_wheel => $ev);
2862
2863 1
2864}
2865
2866sub get_layout {
2867 my ($self, $para) = @_;
2524 2868
2525 my $layout = $self->{layout}; 2869 my $layout = $self->{layout};
2526 2870
2871 $layout->set_font ($self->{font}) if $self->{font};
2872 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2873 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2874 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2875 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 2876 $layout->set_markup ($para->{markup});
2877
2878 $layout->set_shapes (
2879 map
2880 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2881 @{$para->{widget}}
2531 2882 );
2883
2532 $layout->size 2884 $layout
2533} 2885}
2534 2886
2535sub reflow { 2887sub reflow {
2536 my ($self) = @_; 2888 my ($self) = @_;
2537 2889
… …
2544 2896
2545 # todo: base offset on lines or so, not on pixels 2897 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset); 2898 $self->{children}[1]->set_value ($offset);
2547} 2899}
2548 2900
2901sub current_paragraph {
2902 my ($self) = @_;
2903
2904 $self->{top_paragraph} - 1
2905}
2906
2907sub scroll_to {
2908 my ($self, $para) = @_;
2909
2910 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2911
2912 $self->{scroll_to} = $para;
2913 $self->update;
2914}
2915
2549sub clear { 2916sub clear {
2550 my ($self) = @_; 2917 my ($self) = @_;
2918
2919 my (undef, undef, @other) = @{ $self->{children} };
2920 $self->remove ($_) for @other;
2551 2921
2552 $self->{par} = []; 2922 $self->{par} = [];
2553 $self->{height} = 0; 2923 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2924 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2925}
2556 2926
2557sub add_paragraph { 2927sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2928 my $self = shift;
2559 2929
2560 for my $line (split /\n/, $text) { 2930 for my $para (@_) {
2561 my ($w, $h) = $self->text_size ($line); 2931 $para = {
2932 fg => [1, 1, 1, 1],
2933 indent => 0,
2934 markup => "",
2935 widget => [],
2936 ref $para ? %$para : (markup => $para),
2937 w => 1e10,
2938 wrapped => 1,
2939 };
2940
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para;
2943 }
2944
2945 $self->{need_reflow}++;
2946 $self->update;
2947}
2948
2949sub scroll_to_bottom {
2950 my ($self) = @_;
2951
2952 $self->{scroll_to} = $#{$self->{par}};
2953 $self->update;
2954}
2955
2956sub force_uptodate {
2957 my ($self) = @_;
2958
2959 if (delete $self->{need_reflow}) {
2960 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2961
2962 my $height = 0;
2963
2964 for my $para (@{$self->{par}}) {
2965 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2966 my $layout = $self->get_layout ($para);
2967 my ($w, $h) = $layout->size;
2968
2969 $para->{w} = $w + $para->{indent};
2970 $para->{h} = $h;
2971 $para->{wrapped} = $layout->has_wrapped;
2972 }
2973
2974 $para->{y} = $height;
2975 $height += $para->{h};
2976 }
2977
2562 $self->{height} += $h; 2978 $self->{height} = $height;
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2979 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564 }
2565 2980
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2981 delete $self->{texture};
2982 }
2983
2984 if (my $paridx = delete $self->{scroll_to}) {
2985 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2986 }
2567} 2987}
2568 2988
2569sub update { 2989sub update {
2570 my ($self) = @_; 2990 my ($self) = @_;
2571 2991
… …
2574 return unless $self->{h} > 0; 2994 return unless $self->{h} > 0;
2575 2995
2576 delete $self->{texture}; 2996 delete $self->{texture};
2577 2997
2578 $ROOT->on_post_alloc ($self => sub { 2998 $ROOT->on_post_alloc ($self => sub {
2999 $self->force_uptodate;
3000
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3001 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 3002
2581 if (delete $self->{need_reflow}) {
2582 my $height = 0;
2583
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3];
2595 $_->[1] = $h;
2596 }
2597
2598 $height += $_->[1];
2599 }
2600
2601 $self->{height} = $height;
2602
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605 delete $self->{texture};
2606 }
2607
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3003 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 3004 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 3005 glClear GL_COLOR_BUFFER_BIT;
2611 3006
3007 package CFPlus::UI::Base;
3008 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3009 (0, 0, $self->{w}, $self->{h});
3010
3011 my $top = int $self->{children}[1]{range}[0];
3012
3013 my $paridx = 0;
3014 my $top_paragraph;
2612 my $top = int $self->{children}[1]{range}[0]; 3015 my $top = int $self->{children}[1]{range}[0];
2613 3016
2614 my $y0 = $top; 3017 my $y0 = $top;
2615 my $y1 = $top + $H; 3018 my $y1 = $top + $H;
2616 3019
2617 my $y = 0;
2618
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627 for my $par (@{$self->{par}}) { 3020 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 3021 my $h = $para->{h};
3022 my $y = $para->{y};
2629 3023
2630 if ($y0 < $y + $h && $y < $y1) { 3024 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 3025 my $layout = $self->get_layout ($para);
2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 3026
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3027 $layout->render ($para->{indent}, $y - $y0);
2637 3028
2638 glRasterPos $par->[3], $y - $y0; 3029 if (my @w = @{ $para->{widget} }) {
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3030 my @s = $layout->get_shapes;
3031
3032 for (@w) {
3033 my ($dx, $dy) = splice @s, 0, 2, ();
3034
3035 $_->{x} = $dx + $para->{indent};
3036 $_->{y} = $dy + $y - $y0;
3037
3038 $_->draw;
3039 }
3040 }
2640 } 3041 }
2641 3042
2642 $y += $h; 3043 $paridx++;
3044 $top_paragraph ||= $paridx if $y >= $top;
2643 } 3045 }
2644 3046
2645 glDisable GL_BLEND; 3047 $self->{top_paragraph} = $top_paragraph;
2646 }; 3048 };
2647 }); 3049 });
3050}
3051
3052sub reconfigure {
3053 my ($self) = @_;
3054
3055 $self->SUPER::reconfigure;
3056
3057 $_->{w} = 1e10 for @{ $self->{par} };
3058 $self->reflow;
2648} 3059}
2649 3060
2650sub _draw { 3061sub _draw {
2651 my ($self) = @_; 3062 my ($self) = @_;
2652 3063
… …
2655 glColor 0, 0, 0, 1; 3066 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3067 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 3068 glDisable GL_TEXTURE_2D;
2658 3069
2659 $self->{children}[1]->draw; 3070 $self->{children}[1]->draw;
2660
2661} 3071}
2662 3072
2663############################################################################# 3073#############################################################################
2664 3074
2665package CFClient::UI::Animator; 3075package CFPlus::UI::Animator;
2666 3076
2667use CFClient::OpenGL; 3077use CFPlus::OpenGL;
2668 3078
2669our @ISA = CFClient::UI::Bin::; 3079our @ISA = CFPlus::UI::Bin::;
2670 3080
2671sub moveto { 3081sub moveto {
2672 my ($self, $x, $y) = @_; 3082 my ($self, $x, $y) = @_;
2673 3083
2674 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3084 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2702 glPopMatrix; 3112 glPopMatrix;
2703} 3113}
2704 3114
2705############################################################################# 3115#############################################################################
2706 3116
2707package CFClient::UI::Flopper; 3117package CFPlus::UI::Flopper;
2708 3118
2709our @ISA = CFClient::UI::Button::; 3119our @ISA = CFPlus::UI::Button::;
2710 3120
2711sub new { 3121sub new {
2712 my $class = shift; 3122 my $class = shift;
2713 3123
2714 my $self = $class->SUPER::new ( 3124 my $self = $class->SUPER::new (
… …
2726 $self->{other}->toggle_visibility; 3136 $self->{other}->toggle_visibility;
2727} 3137}
2728 3138
2729############################################################################# 3139#############################################################################
2730 3140
2731package CFClient::UI::Tooltip; 3141package CFPlus::UI::Tooltip;
2732 3142
2733our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2734 3144
2735use CFClient::OpenGL; 3145use CFPlus::OpenGL;
2736 3146
2737sub new { 3147sub new {
2738 my $class = shift; 3148 my $class = shift;
2739 3149
2740 $class->SUPER::new ( 3150 $class->SUPER::new (
… …
2743 ) 3153 )
2744} 3154}
2745 3155
2746sub set_tooltip_from { 3156sub set_tooltip_from {
2747 my ($self, $widget) = @_; 3157 my ($self, $widget) = @_;
3158
3159 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3160 if $widget->{tooltip} =~ /^#(.*)$/;
2748 3161
2749 my $tooltip = $widget->{tooltip}; 3162 my $tooltip = $widget->{tooltip};
2750 3163
2751 if ($ENV{CFPLUS_DEBUG} & 2) { 3164 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 3165 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3166 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 3167 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 3168 . "visible $widget->{visible}";
2756 } 3169 }
2757 3170
3171 $tooltip =~ s/^\n+//;
3172 $tooltip =~ s/\n+$//;
3173
2758 $self->add (new CFClient::UI::Label 3174 $self->add (new CFPlus::UI::Label
2759 markup => $tooltip, 3175 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3176 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 3177 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 3178 style => 1, # FLAG_INVERSE
2763 ellipsise => 0, 3179 ellipsise => 0,
2764 font => ($widget->{tooltip_font} || $::FONT_PROP), 3180 font => ($widget->{tooltip_font} || $::FONT_PROP),
2765 ); 3181 );
2766} 3182}
2767 3183
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3187 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 3188
2773 ($w + 4, $h + 4) 3189 ($w + 4, $h + 4)
2774} 3190}
2775 3191
2776sub size_allocate { 3192sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
2778 3194
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 3195 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 3196}
2781 3197
2782sub visibility_change { 3198sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 3199 my ($self, $visible) = @_;
2784 3200
2785 return unless $visible; 3201 return unless $visible;
2786 3202
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 3203 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner} 3204 my $widget = $self->{owner}
2789 or return; 3205 or return;
2790 3206
3207 if ($widget->{visible}) {
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3208 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 3209
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3210 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w}; 3211 if $x + $self->{w} > $self->{root}{w};
2795 3212
2796 $self->move_abs ($x, $y); 3213 $self->move_abs ($x, $y);
3214 } else {
3215 $self->hide;
3216 }
2797 }); 3217 });
2798} 3218}
2799 3219
2800sub _draw { 3220sub _draw {
2801 my ($self) = @_; 3221 my ($self) = @_;
… …
2825 $self->SUPER::_draw; 3245 $self->SUPER::_draw;
2826} 3246}
2827 3247
2828############################################################################# 3248#############################################################################
2829 3249
2830package CFClient::UI::Face; 3250package CFPlus::UI::Face;
2831 3251
2832our @ISA = CFClient::UI::Base::; 3252our @ISA = CFPlus::UI::DrawBG::;
2833 3253
2834use CFClient::OpenGL; 3254use CFPlus::OpenGL;
2835 3255
2836sub new { 3256sub new {
2837 my $class = shift; 3257 my $class = shift;
2838 3258
2839 my $self = $class->SUPER::new ( 3259 my $self = $class->SUPER::new (
… …
2874sub _draw { 3294sub _draw {
2875 my ($self) = @_; 3295 my ($self) = @_;
2876 3296
2877 return unless $::CONN; 3297 return unless $::CONN;
2878 3298
3299 $self->SUPER::_draw;
3300
2879 my $face; 3301 my $face;
2880 3302
2881 if ($self->{frame}) { 3303 if ($self->{frame}) {
2882 my $anim = $::CONN->{anim}[$self->{anim}]; 3304 my $anim = $::CONN->{anim}[$self->{anim}];
2883 3305
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3316 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3317 glDisable GL_TEXTURE_2D;
2896 } 3318 }
2897} 3319}
2898 3320
2899sub DESTROY { 3321sub destroy {
2900 my ($self) = @_; 3322 my ($self) = @_;
2901 3323
2902 $self->{timer}->cancel 3324 $self->{timer}->cancel
2903 if $self->{timer}; 3325 if $self->{timer};
2904 3326
2905 $self->SUPER::DESTROY; 3327 $self->SUPER::destroy;
2906} 3328}
2907 3329
2908############################################################################# 3330#############################################################################
2909 3331
2910package CFClient::UI::Buttonbar; 3332package CFPlus::UI::Buttonbar;
2911 3333
2912our @ISA = CFClient::UI::HBox::; 3334our @ISA = CFPlus::UI::HBox::;
2913 3335
2914# TODO: should actualyl wrap buttons and other goodies. 3336# TODO: should actually wrap buttons and other goodies.
2915 3337
2916############################################################################# 3338#############################################################################
2917 3339
2918package CFClient::UI::Menu; 3340package CFPlus::UI::Menu;
2919 3341
2920our @ISA = CFClient::UI::FancyFrame::; 3342our @ISA = CFPlus::UI::Toplevel::;
2921 3343
2922use CFClient::OpenGL; 3344use CFPlus::OpenGL;
2923 3345
2924sub new { 3346sub new {
2925 my $class = shift; 3347 my $class = shift;
2926 3348
2927 my $self = $class->SUPER::new ( 3349 my $self = $class->SUPER::new (
2928 items => [], 3350 items => [],
2929 z => 100, 3351 z => 100,
2930 @_, 3352 @_,
2931 ); 3353 );
2932 3354
2933 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3355 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934 3356
2935 for my $item (@{ $self->{items} }) { 3357 for my $item (@{ $self->{items} }) {
2936 my ($widget, $cb, $tooltip) = @$item; 3358 my ($widget, $cb, $tooltip) = @$item;
2937 3359
2938 # handle various types of items, only text for now 3360 # handle various types of items, only text for now
2939 if (!ref $widget) { 3361 if (!ref $widget) {
3362 if ($widget =~ /\t/) {
3363 my ($left, $right) = split /\t/, $widget, 2;
3364
2940 $widget = new CFClient::UI::Label 3365 $widget = new CFPlus::UI::HBox
2941 can_hover => 1, 3366 can_hover => 1,
2942 can_events => 1, 3367 can_events => 1,
2943 text => $widget,
2944 tooltip => $tooltip 3368 tooltip => $tooltip,
3369 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ],
3373 ;
3374
3375 } else {
3376 $widget = new CFPlus::UI::Label
3377 can_hover => 1,
3378 can_events => 1,
3379 markup => $widget,
3380 tooltip => $tooltip;
3381 }
2945 } 3382 }
2946 3383
2947 $self->{item}{$widget} = $item; 3384 $self->{item}{$widget} = $item;
2948 3385
2949 $self->{vbox}->add ($widget); 3386 $self->{vbox}->add ($widget);
… …
2954 3391
2955# popup given the event (must be a mouse button down event currently) 3392# popup given the event (must be a mouse button down event currently)
2956sub popup { 3393sub popup {
2957 my ($self, $ev) = @_; 3394 my ($self, $ev) = @_;
2958 3395
2959 $self->_emit ("popdown"); 3396 $self->emit ("popdown");
2960 3397
2961 # maybe save $GRAB? must be careful about events... 3398 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3399 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3400 $self->{button} = $ev->{button};
2964 3401
2965 $self->show; 3402 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3403 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967} 3404}
2968 3405
2969sub mouse_motion { 3406sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3407 my ($self, $ev, $x, $y) = @_;
2971 3408
2972 # TODO: should use vbox->find_widget or so 3409 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3410 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3411 $self->{hover} = $self->{item}{$HOVER};
2975 3412
2976 0 3413 0
2977} 3414}
2978 3415
2979sub button_up { 3416sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3417 my ($self, $ev, $x, $y) = @_;
2981 3418
2982 if ($ev->{button} == $self->{button}) { 3419 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3420 undef $GRAB;
2984 $self->hide; 3421 $self->hide;
2985 3422
2986 $self->_emit ("popdown"); 3423 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3424 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3425 } else {
2989 return 0 3426 return 0
2990 } 3427 }
2991 3428
2992 1 3429 1
2993} 3430}
2994 3431
2995############################################################################# 3432#############################################################################
2996 3433
2997package CFClient::UI::Multiplexer; 3434package CFPlus::UI::Multiplexer;
2998 3435
2999our @ISA = CFClient::UI::Container::; 3436our @ISA = CFPlus::UI::Container::;
3000 3437
3001sub new { 3438sub new {
3002 my $class = shift; 3439 my $class = shift;
3003 3440
3004 my $self = $class->SUPER::new ( 3441 my $self = $class->SUPER::new (
… …
3018 3455
3019 $self->{current} = $self->{children}[0] 3456 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} }; 3457 if @{ $self->{children} };
3021} 3458}
3022 3459
3460sub get_current_page {
3461 my ($self) = @_;
3462
3463 $self->{current}
3464}
3465
3023sub set_current_page { 3466sub set_current_page {
3024 my ($self, $page_or_widget) = @_; 3467 my ($self, $page_or_widget) = @_;
3025 3468
3026 my $widget = ref $page_or_widget 3469 my $widget = ref $page_or_widget
3027 ? $page_or_widget 3470 ? $page_or_widget
3028 : $self->{children}[$page_or_widget]; 3471 : $self->{children}[$page_or_widget];
3029 3472
3030 $self->{current} = $widget; 3473 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3474 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3475
3033 $self->_emit (page_changed => $self->{current}); 3476 $self->emit (page_changed => $self->{current});
3034 3477
3035 $self->realloc; 3478 $self->realloc;
3036} 3479}
3037 3480
3038sub visible_children { 3481sub visible_children {
… …
3043 my ($self) = @_; 3486 my ($self) = @_;
3044 3487
3045 $self->{current}->size_request 3488 $self->{current}->size_request
3046} 3489}
3047 3490
3048sub size_allocate { 3491sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3492 my ($self, $w, $h) = @_;
3050 3493
3051 $self->{current}->configure (0, 0, $w, $h); 3494 $self->{current}->configure (0, 0, $w, $h);
3495
3496 1
3052} 3497}
3053 3498
3054sub _draw { 3499sub _draw {
3055 my ($self) = @_; 3500 my ($self) = @_;
3056 3501
3057 $self->{current}->draw; 3502 $self->{current}->draw;
3058} 3503}
3059 3504
3060############################################################################# 3505#############################################################################
3061 3506
3062package CFClient::UI::Notebook; 3507package CFPlus::UI::Notebook;
3063 3508
3064our @ISA = CFClient::UI::VBox::; 3509our @ISA = CFPlus::UI::VBox::;
3065 3510
3066sub new { 3511sub new {
3067 my $class = shift; 3512 my $class = shift;
3068 3513
3069 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar), 3515 buttonbar => (new CFPlus::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self 3517 # filter => # will be put between multiplexer and $self
3073 @_, 3518 @_,
3074 ); 3519 );
3075 3520
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3082sub add { 3527sub add {
3083 my ($self, $title, $widget, $tooltip) = @_; 3528 my ($self, $title, $widget, $tooltip) = @_;
3084 3529
3085 Scalar::Util::weaken $self; 3530 Scalar::Util::weaken $self;
3086 3531
3087 $self->{buttonbar}->add (new CFClient::UI::Button 3532 $self->{buttonbar}->add (new CFPlus::UI::Button
3088 markup => $title, 3533 markup => $title,
3089 tooltip => $tooltip, 3534 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) }, 3535 on_activate => sub { $self->set_current_page ($widget) },
3091 ); 3536 );
3092 3537
3093 $self->{multiplexer}->add ($widget); 3538 $self->{multiplexer}->add ($widget);
3094} 3539}
3095 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{multiplexer}->get_current_page
3545}
3546
3096sub set_current_page { 3547sub set_current_page {
3097 my ($self, $page) = @_; 3548 my ($self, $page) = @_;
3098 3549
3099 $self->{multiplexer}->set_current_page ($page); 3550 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3551 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3552}
3102 3553
3103############################################################################# 3554#############################################################################
3104 3555
3105package CFClient::UI::Combobox; 3556package CFPlus::UI::Selector;
3106 3557
3107use utf8; 3558use utf8;
3108 3559
3109our @ISA = CFClient::UI::Button::; 3560our @ISA = CFPlus::UI::Button::;
3110 3561
3111sub new { 3562sub new {
3112 my $class = shift; 3563 my $class = shift;
3113 3564
3114 my $self = $class->SUPER::new ( 3565 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3566 options => [], # [value, title, longdesc], ...
3116 value => undef, 3567 value => undef,
3117 @_, 3568 @_,
3118 ); 3569 );
3119 3570
3120 $self->_set_value ($self->{value}); 3571 $self->_set_value ($self->{value});
3121 3572
3122 $self 3573 $self
3123} 3574}
3124 3575
3125sub button_down { 3576sub invoke_button_down {
3126 my ($self, $ev) = @_; 3577 my ($self, $ev) = @_;
3127 3578
3128 my @menu_items; 3579 my @menu_items;
3129 3580
3130 for (@{ $self->{options} }) { 3581 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3582 my ($value, $title, $tooltip) = @$_;
3132 3583
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3584 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3585 }
3135 3586
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3587 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3588}
3138 3589
3139sub _set_value { 3590sub _set_value {
3140 my ($self, $value) = @_; 3591 my ($self, $value) = @_;
3141 3592
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3593 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3594 or return;
3144 3595
3145 $self->{value} = $item->[1]; 3596 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3597 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3598 $self->set_tooltip ($item->[2]);
3148} 3599}
3149 3600
3150sub set_value { 3601sub set_value {
3151 my ($self, $value) = @_; 3602 my ($self, $value) = @_;
3152 3603
3153 return unless $self->{value} ne $value; 3604 return unless $self->{value} ne $value;
3154 3605
3155 $self->_set_value ($value); 3606 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3607 $self->emit (changed => $value);
3157} 3608}
3158 3609
3159############################################################################# 3610#############################################################################
3160 3611
3161package CFClient::UI::Statusbox; 3612package CFPlus::UI::Statusbox;
3162 3613
3163our @ISA = CFClient::UI::VBox::; 3614our @ISA = CFPlus::UI::VBox::;
3164 3615
3165sub new { 3616sub new {
3166 my $class = shift; 3617 my $class = shift;
3167 3618
3168 my $self = $class->SUPER::new ( 3619 my $self = $class->SUPER::new (
… …
3180sub reorder { 3631sub reorder {
3181 my ($self) = @_; 3632 my ($self) = @_;
3182 my $NOW = Time::HiRes::time; 3633 my $NOW = Time::HiRes::time;
3183 3634
3184 # freeze display when hovering over any label 3635 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner} 3636 return if $CFPlus::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3637 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} }; 3638 values %{ $self->{item} };
3188 3639
3189 while (my ($k, $v) = each %{ $self->{item} }) { 3640 while (my ($k, $v) = each %{ $self->{item} }) {
3190 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3641 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191 } 3642 }
… …
3212 for ($short) { 3663 for ($short) {
3213 s/^\s+//; 3664 s/^\s+//;
3214 s/\s+/ /g; 3665 s/\s+/ /g;
3215 } 3666 }
3216 3667
3217 new CFClient::UI::Label 3668 new CFPlus::UI::Label
3218 markup => $short, 3669 markup => $short,
3219 tooltip => $item->{tooltip}, 3670 tooltip => $item->{tooltip},
3220 tooltip_font => $::FONT_PROP, 3671 tooltip_font => $::FONT_PROP,
3221 tooltip_width => 0.67, 3672 tooltip_width => 0.67,
3222 fontsize => $item->{fontsize} || $self->{fontsize}, 3673 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3260 $item->{count}++; 3711 $item->{count}++;
3261 } else { 3712 } else {
3262 $item->{count} = 1; 3713 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3714 $item->{text} = $item->{tooltip} = $text;
3264 } 3715 }
3265 $item->{id} = ++$self->{id}; 3716 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3717 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3718 delete $item->{label};
3268 } else { 3719 } else {
3269 $self->{item}{$group} = { 3720 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3721 id => ++$self->{id},
… …
3276 count => 1, 3727 count => 1,
3277 %arg, 3728 %arg,
3278 }; 3729 };
3279 } 3730 }
3280 3731
3732 $ROOT->on_refresh (reorder => sub {
3281 $self->reorder; 3733 $self->reorder;
3734 });
3282} 3735}
3283 3736
3284sub reconfigure { 3737sub reconfigure {
3285 my ($self) = @_; 3738 my ($self) = @_;
3286 3739
… …
3289 3742
3290 $self->reorder; 3743 $self->reorder;
3291 $self->SUPER::reconfigure; 3744 $self->SUPER::reconfigure;
3292} 3745}
3293 3746
3294sub DESTROY { 3747sub destroy {
3295 my ($self) = @_; 3748 my ($self) = @_;
3296 3749
3297 $self->{timer}->cancel; 3750 $self->{timer}->cancel;
3298 3751
3299 $self->SUPER::DESTROY; 3752 $self->SUPER::destroy;
3300} 3753}
3301 3754
3302############################################################################# 3755#############################################################################
3303 3756
3304package CFClient::UI::Inventory; 3757package CFPlus::UI::Inventory;
3305 3758
3306our @ISA = CFClient::UI::ScrolledWindow::; 3759our @ISA = CFPlus::UI::Table::;
3307 3760
3308sub new { 3761sub new {
3309 my $class = shift; 3762 my $class = shift;
3310 3763
3311 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3765 col_expand => [0, 1, 0],
3766 items => [],
3313 @_, 3767 @_,
3314 ); 3768 );
3315 3769
3770 $self->set_sort_order (undef);
3771
3316 $self 3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3317} 3808}
3318 3809
3319sub set_items { 3810sub set_items {
3320 my ($self, $items) = @_; 3811 my ($self, $items) = @_;
3321 3812
3322 $self->{child}->clear; 3813 $self->{items} = [$items ? values %$items : ()];
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets; 3814 $self->update_items;
3406
3407 $self
3408} 3815}
3409 3816
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541############################################################################# 3817#############################################################################
3542 3818
3543package CFClient::UI::SpellList; 3819package CFPlus::UI::SpellList;
3544 3820
3545our @ISA = CFClient::UI::Table::; 3821our @ISA = CFPlus::UI::Table::;
3546 3822
3547sub new { 3823sub new {
3548 my $class = shift; 3824 my $class = shift;
3549 3825
3550 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
… …
3552 commands => [], 3828 commands => [],
3553 @_, 3829 @_,
3554 ) 3830 )
3555} 3831}
3556 3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563 3845
3564sub rebuild_spell_list { 3846sub rebuild_spell_list {
3565 my ($self) = @_; 3847 my ($self) = @_;
3566 3848
3567 $CFClient::UI::ROOT->on_refresh ($self => sub { 3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear; 3850 $self->clear;
3569 3851
3852 return unless $::CONN;
3853
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574 3859
3575 my $row = 0; 3860 my $row = 0;
3576 3861
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_}; 3863 my $spell = $self->{spell}{$_};
3579 3864
3580 $row++; 3865 $row++;
3581 3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3582 $self->add (0, $row, new CFClient::UI::Face 3894 $self->add (0, $row, new CFPlus::UI::Face
3583 face => $spell->{face}, 3895 face => $spell->{face},
3584 can_hover => 1, 3896 can_hover => 1,
3585 can_events => 1, 3897 can_events => 1,
3586 tooltip => $spell->{message}, 3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3587 ); 3900 );
3588 3901
3589 $self->add (1, $row, new CFClient::UI::Label 3902 $self->add (1, $row, new CFPlus::UI::Label
3590 expand => 1, 3903 expand => 1,
3591 text => $spell->{name}, 3904 text => $spell->{name},
3592 can_hover => 1, 3905 can_hover => 1,
3593 can_events => 1, 3906 can_events => 1,
3594 tooltip => $spell->{message}, 3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3595 ); 3909 );
3596 3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 } 3915 }
3608 }); 3916 });
3609} 3917}
3610 3918
3611sub add_spell { 3919sub add_spell {
… …
3620 3928
3621 delete $self->{spell}->{$spell->{name}}; 3929 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list; 3930 $self->rebuild_spell_list;
3623} 3931}
3624 3932
3625############################################################################# 3933sub clear_spells {
3934 my ($self) = @_;
3626 3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3627package CFClient::UI::Root; 3942package CFPlus::UI::Root;
3628 3943
3629our @ISA = CFClient::UI::Container::; 3944our @ISA = CFPlus::UI::Container::;
3630 3945
3631use List::Util qw(min max); 3946use List::Util qw(min max);
3632 3947
3633use CFClient::OpenGL; 3948use CFPlus::OpenGL;
3634 3949
3635sub new { 3950sub new {
3636 my $class = shift; 3951 my $class = shift;
3637 3952
3638 my $self = $class->SUPER::new ( 3953 my $self = $class->SUPER::new (
… …
3663 $coord = $max - $size if $coord > $max - $size; 3978 $coord = $max - $size if $coord > $max - $size;
3664 3979
3665 int $coord + 0.5 3980 int $coord + 0.5
3666} 3981}
3667 3982
3668sub size_allocate { 3983sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 3984 my ($self, $w, $h) = @_;
3670 3985
3671 for my $child ($self->children) { 3986 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 3988
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 3992 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 3993 $Y = _to_pixel $Y, $H, $self->{h};
3679 3994
3680 $child->configure ($X, $Y, $W, $H); 3995 $child->configure ($X, $Y, $W, $H);
3681 } 3996 }
3997
3998 1
3682} 3999}
3683 4000
3684sub coord2local { 4001sub coord2local {
3685 my ($self, $x, $y) = @_; 4002 my ($self, $x, $y) = @_;
3686 4003
… …
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813 4130
3814 $w = 0 if $w < 0; 4131 $w = 0 if $w < 0;
3815 $h = 0 if $h < 0; 4132 $h = 0 if $h < 0;
3816 4133
4134 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h;
4136
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142
3817 $w = int $w + 0.5; 4143 $w = int $w + 0.5;
3818 $h = int $h + 0.5; 4144 $h = int $h + 0.5;
3819 4145
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w}; 4147 $widget->{old_w} = $widget->{w};
… …
3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4170 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845 glMatrixMode GL_MODELVIEW; 4171 glMatrixMode GL_MODELVIEW;
3846 glLoadIdentity; 4172 glLoadIdentity;
3847 4173
3848 { 4174 {
3849 package CFClient::UI::Base; 4175 package CFPlus::UI::Base;
3850 4176
3851 ($draw_x, $draw_y, $draw_w, $draw_h) = 4177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h}); 4178 (0, 0, $self->{w}, $self->{h});
3853 }
3854 4179
3855 $self->_draw; 4180 $self->_draw;
4181 }
3856} 4182}
3857 4183
3858############################################################################# 4184#############################################################################
3859 4185
3860package CFClient::UI; 4186package CFPlus::UI;
3861 4187
3862$ROOT = new CFClient::UI::Root; 4188$ROOT = new CFPlus::UI::Root;
3863$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4189$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864 4190
38651 41911
3866 4192

Diff Legend

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