ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC

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

Diff Legend

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