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.309 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 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->emit ("focus_out"); 309 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
… …
335sub size_request { 358sub size_request {
336 require Carp; 359 require Carp;
337 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
338} 361}
339 362
363sub baseline_shift {
364 0
365}
366
340sub configure { 367sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
342 369
343 if ($self->{aspect}) { 370 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
345 372
346 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 375
349 # use alignment to adjust x, y 376 # use alignment to adjust x, y
350 377
351 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
393 420
394 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
395 422
396 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
397 424
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 428 }
402} 429}
403 430
404# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
405sub coord2local { 432sub coord2local {
406 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
407 434
435 Carp::confess unless $self->{parent};#d#
436
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 438}
410 439
411# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
412sub coord2global { 441sub coord2global {
413 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
414 443
444 Carp::confess unless $self->{parent};#d#
445
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 447}
417 448
418sub invoke_focus_in { 449sub invoke_focus_in {
419 my ($self) = @_; 450 my ($self) = @_;
420 451
421 return if $FOCUS == $self; 452 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
423 454
424 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
425 456
426 $focus->update if $focus; 457 $self->update;
427 $FOCUS->update;
428 458
429 0 459 0
430} 460}
431 461
432sub invoke_focus_out { 462sub invoke_focus_out {
433 my ($self) = @_; 463 my ($self) = @_;
434 464
435 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
436 466
437 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
438 468
439 $focus->update if $focus; #? 469 $self->update;
440 470
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 472 unless $FOCUS;
443 473
444 0 474 0
445} 475}
446 476
447sub grab_focus { 477sub grab_focus {
448 my ($self) = @_; 478 my ($self) = @_;
449 479
480 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 481 $self->emit ("focus_in");
451} 482}
452 483
453sub invoke_mouse_motion { 1 } 484sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 485sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 486sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
457 489
458sub invoke_button_down { 490sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
460 492
461 $self->grab_focus; 493 $self->grab_focus;
462 494
463 1 495 0
464} 496}
465 497
466sub connect { 498sub connect {
467 my ($self, $signal, $cb) = @_; 499 my ($self, $signal, $cb) = @_;
468 500
469 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
470} 507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
471 515
472sub emit { 516sub emit {
473 my ($self, $signal, @args) = @_; 517 my ($self, $signal, @args) = @_;
474 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 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
475 #d##TODO# stop propagating at first true, do not use sum 533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
479} 545}
480 546
481sub find_widget { 547sub find_widget {
482 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
483 549
… …
535 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
536 602
537 # update screen rectangle 603 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 606
543 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 610
… …
569 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
572 glEnd; 636 glEnd;
573 glPopMatrix; 637 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 } 639 }
576 640
577 $self->_draw; 641 $self->_draw;
578 glPopMatrix; 642 glPopMatrix;
579} 643}
… …
585} 649}
586 650
587sub DESTROY { 651sub DESTROY {
588 my ($self) = @_; 652 my ($self) = @_;
589 653
654 return if CFPlus::in_destruct;
655
590 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
591 657
592 eval { $self->destroy }; 658 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 660}
595 661
596############################################################################# 662#############################################################################
597 663
598package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
599 665
600our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
601 667
602use strict; 668use strict;
603use CFClient::OpenGL; 669use CFPlus::OpenGL;
604 670
605sub new { 671sub new {
606 my $class = shift; 672 my $class = shift;
607 673
608 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
639 } 705 }
640} 706}
641 707
642############################################################################# 708#############################################################################
643 709
644package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
645 711
646our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
647 713
648sub new { 714sub new {
649 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
651} 717}
… …
658 724
659sub draw { } 725sub draw { }
660 726
661############################################################################# 727#############################################################################
662 728
663package CFClient::UI::Container; 729package CFPlus::UI::Container;
664 730
665our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
666 732
667sub new { 733sub new {
668 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
669 735
670 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
679 if $children; 745 if $children;
680 746
681 $self 747 $self
682} 748}
683 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
684sub add { 758sub add {
685 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
686 760
687 $_->set_parent ($self) 761 $_->set_parent ($self)
688 for @widgets; 762 for @widgets;
… …
748 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
749} 823}
750 824
751############################################################################# 825#############################################################################
752 826
753package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
754 828
755our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
756 830
757sub new { 831sub new {
758 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
759 833
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 835
762 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
763} 837}
764 838
765sub add { 839sub add {
… …
772sub remove { 846sub remove {
773 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
774 848
775 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
776 850
777 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 852 unless @{$self->{children}};
779} 853}
780 854
781sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
782 856
… …
794 868
795############################################################################# 869#############################################################################
796 870
797# back-buffered drawing area 871# back-buffered drawing area
798 872
799package CFClient::UI::Window; 873package CFPlus::UI::Window;
800 874
801our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
802 876
803use CFClient::OpenGL; 877use CFPlus::OpenGL;
804 878
805sub new { 879sub new {
806 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
807 881
808 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
830} 904}
831 905
832sub render_child { 906sub render_child {
833 my ($self) = @_; 907 my ($self) = @_;
834 908
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
838 912
839 { 913 {
840 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
841 915
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
844 } 920 }
845
846 $self->_render;
847 }; 921 };
848} 922}
849 923
850sub _draw { 924sub _draw {
851 my ($self) = @_; 925 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 926
855 my $tex = $self->{texture} 927 my $tex = $self->{texture}
856 or return; 928 or return;
857 929
858 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
861 933
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
863 935
864 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
865} 937}
866 938
867############################################################################# 939#############################################################################
868 940
869package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
870 942
871our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
872 944
873sub new { 945sub new {
874 my $class = shift; 946 my $class = shift;
875 947
876 $class->SUPER::new ( 948 $class->SUPER::new (
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1010 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1012 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1014 }
943} 1015}
944 1016
945sub _render { 1017sub _render {
946 my ($self) = @_; 1018 my ($self) = @_;
947 1019
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1022
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1024
953 $self->SUPER::_render; 1025 $self->SUPER::_render;
954} 1026}
955 1027
956############################################################################# 1028#############################################################################
957 1029
958package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
959 1031
960our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
961 1033
962sub new { 1034sub new {
963 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
964 1036
965 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
966 1038
967 my $self; 1039 my $self;
968 1040
969 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1042 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1044 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
974 }, 1046 },
975 ; 1047 ;
976 1048
977 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
979 slider => $slider, 1052 slider => $slider,
980 %arg, 1053 %arg,
981 ); 1054 );
982 1055
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
985 1058
986 $self 1059 $self
987} 1060}
988 1061
1062#TODO# update range on size_allocate depending on child
1063
989sub add { 1064sub add {
990 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
991 1066
992 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
993} 1068}
994 1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1084}
1085
995sub update { 1086sub update {
996 my ($self) = @_; 1087 my ($self) = @_;
997 1088
998 $self->SUPER::update; 1089 $self->SUPER::update;
999 1090
1000 # todo: overwrite size_allocate of child 1091 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1092}
1004 1093
1005sub invoke_size_allocate { 1094sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
1007 1096
1008 my $child = $self->{vp}->child; 1097 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1098
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1099 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1100}
1013 1101
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1102#############################################################################
1018 1103
1019package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1020 1105
1021our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1022 1107
1023use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1024 1109
1025sub new { 1110sub new {
1026 my $class = shift; 1111 my $class = shift;
1027 1112
1028 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1055} 1140}
1056 1141
1057############################################################################# 1142#############################################################################
1058 1143
1059package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1060 1145
1061our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1062 1147
1063use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1149
1150sub new {
1151 my ($class, %arg) = @_;
1152
1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1064 1249
1065my $bg = 1250my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1252 mipmap => 1, wrap => 1;
1068 1253
1069my @border = 1254my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1257
1073sub new { 1258sub new {
1074 my ($class, %arg) = @_; 1259 my ($class, %arg) = @_;
1075 1260
1076 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1264 border => 0.6,
1080 can_events => 1, 1265 can_events => 1,
1081 min_w => 16, 1266 min_w => 64,
1082 min_h => 16, 1267 min_h => 32,
1083 %arg, 1268 %arg,
1084 ); 1269 );
1085 1270
1086 $self->{title_widget} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1272 align => 0,
1088 valign => 1, 1273 valign => 1,
1089 text => $self->{title}, 1274 text => $self->{title},
1090 fontsize => $self->{border}, 1275 fontsize => $self->{border},
1091 if exists $self->{title}; 1276 if exists $self->{title};
1092 1277
1093 if ($self->{has_close_button}) { 1278 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1279 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1280 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1281 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1282 on_activate => sub { $self->emit ("delete") };
1098 1283
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1285 }
1101 1286
1102 $self 1287 $self
1103} 1288}
1104 1289
1105sub add { 1290sub add {
1106 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1107 1292
1108 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1296}
1112 1297
1113sub border { 1298sub border {
1114 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1115} 1300}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1333 $self->child->configure ($border, $border, $w, $h);
1149 1334
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1335 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1336 if $self->{close_button};
1152 1337
1338 1
1339}
1340
1341sub invoke_delete {
1342 my ($self) = @_;
1343
1344 $self->hide;
1345
1153 1 1346 1
1154} 1347}
1155 1348
1156sub invoke_button_down { 1349sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1409
1217 ! ! $self->{motion} 1410 ! ! $self->{motion}
1218} 1411}
1219 1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1419}
1420
1220sub _draw { 1421sub _draw {
1221 my ($self) = @_; 1422 my ($self) = @_;
1222 1423
1223 my $child = $self->{children}[0]; 1424 my $child = $self->{children}[0];
1224 1425
… …
1261 if $self->{close_button}; 1462 if $self->{close_button};
1262} 1463}
1263 1464
1264############################################################################# 1465#############################################################################
1265 1466
1266package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1267 1468
1268our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1269 1470
1270use List::Util qw(max sum); 1471use List::Util qw(max sum);
1271 1472
1272use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1273 1474
1274sub new { 1475sub new {
1275 my $class = shift; 1476 my $class = shift;
1276 1477
1277 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1283sub children { 1484sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1486}
1286 1487
1287sub add { 1488sub add {
1288 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1289 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1493 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1292 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1499 $self->realloc;
1294} 1500}
1295 1501
1296sub remove { 1502sub remove {
1297 my ($self, $child) = @_; 1503 my ($self, $child) = @_;
… …
1362 1568
1363 # linearly scale sizes 1569 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1572
1367 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1368 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1369 1575
1370 my $y; 1576 my $y;
1371 1577
1372 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1416 } 1622 }
1417} 1623}
1418 1624
1419############################################################################# 1625#############################################################################
1420 1626
1421package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1422 1628
1423our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1424 1630
1425sub size_request { 1631sub size_request {
1426 my ($self) = @_; 1632 my ($self) = @_;
1427 1633
1428 $self->{vertical} 1634 $self->{vertical}
… …
1438 1644
1439sub invoke_size_allocate { 1645sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1441 1647
1442 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1444 1650
1445 my @req; 1651 my @req;
1446 1652
1447 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1449 } else { 1655 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1452 1658
1453 if ($req > $space) { 1659 if ($req > $space) {
1454 # ah well, not enough space 1660 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1456 } else { 1662 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1664
1459 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1460 1666
1461 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1668 for 0 .. $#children;
1463 } 1669 }
1464 } 1670 }
1465 1671
1466 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1467 1673
1468 my $pos = 0; 1674 my $pos = 0;
1469 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1678
1473 $pos += $alloc; 1679 $pos += $alloc;
1474 } 1680 }
1475 1681
1476 1 1682 1
1477} 1683}
1478 1684
1479############################################################################# 1685#############################################################################
1480 1686
1481package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1482 1688
1483our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1484 1690
1485sub new { 1691sub new {
1486 my $class = shift; 1692 my $class = shift;
1487 1693
1488 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1491 ) 1697 )
1492} 1698}
1493 1699
1494############################################################################# 1700#############################################################################
1495 1701
1496package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1497 1703
1498our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1499 1705
1500sub new { 1706sub new {
1501 my $class = shift; 1707 my $class = shift;
1502 1708
1503 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1506 ) 1712 )
1507} 1713}
1508 1714
1509############################################################################# 1715#############################################################################
1510 1716
1511package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1512 1718
1513our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1514 1720
1515use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1516 1722
1517sub new { 1723sub new {
1518 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1519 1725
1520 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1729 #active_bg => none
1524 #font => default_font 1730 #font => default_font
1525 #text => initial text 1731 #text => initial text
1526 #markup => initial narkup 1732 #markup => initial narkup
1527 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1528 ellipsise => 3, # end 1735 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1737 fontsize => 1,
1531 align => -1, 1738 align => -1,
1532 valign => -1, 1739 valign => -1,
1533 padding_x => 2, 1740 padding_x => 2,
1534 padding_y => 2, 1741 padding_y => 2,
1535 can_events => 0, 1742 can_events => 0,
1536 %arg 1743 %arg
1537 ); 1744 );
1538 1745
1539 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1749 $self->{template} = $layout;
1543 } 1750 }
1544 1751
1545 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1549 } 1756 }
1550 1757
1551 $self 1758 $self
1552} 1759}
1553 1760
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1761sub update {
1565 my ($self) = @_; 1762 my ($self) = @_;
1566 1763
1567 delete $self->{texture}; 1764 delete $self->{texture};
1568 $self->SUPER::update; 1765 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1580 1777
1581 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1583 1780
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1586 1782
1587 delete $self->{size_req}; 1783 delete $self->{size_req};
1588 $self->realloc; 1784 $self->realloc;
1589 $self->update; 1785 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1597 1793
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1795
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1602 1797
1603 delete $self->{size_req}; 1798 delete $self->{size_req};
1604 $self->realloc; 1799 $self->realloc;
1605 $self->update; 1800 $self->update;
… …
1617 1812
1618 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1619 1814
1620 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1816 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1819
1624 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1625 1821
1626 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
… …
1631 }; 1827 };
1632 1828
1633 @{ $self->{size_req} } 1829 @{ $self->{size_req} }
1634} 1830}
1635 1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1636sub invoke_size_allocate { 1836sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1638 1838
1639 delete $self->{ox}; 1839 delete $self->{ox};
1640 1840
… …
1646 1846
1647sub set_fontsize { 1847sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1649 1849
1650 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1651 delete $self->{texture}; 1852 delete $self->{texture};
1652 1853
1653 $self->realloc; 1854 $self->realloc;
1654} 1855}
1655 1856
1656sub reconfigure { 1857sub reconfigure {
1657 my ($self) = @_; 1858 my ($self) = @_;
1658 1859
1659 delete $self->{size_req}; 1860 delete $self->{size_req};
1861 delete $self->{texture};
1660 1862
1661 $self->SUPER::reconfigure; 1863 $self->SUPER::reconfigure;
1662} 1864}
1663 1865
1664sub _draw { 1866sub _draw {
1665 my ($self) = @_; 1867 my ($self) = @_;
1666 1868
1667 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1668 1870
1669 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1878
1677 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1678 }; 1880 };
1679 1881
1680 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1684 1886
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1890 };
1689 1891
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1894
1695 if ($tex->{format} == GL_ALPHA) { 1895 $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} 1896}
1706 1897
1707############################################################################# 1898#############################################################################
1708 1899
1709package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1710 1901
1711our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1712 1903
1713use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1714 1905
1715sub new { 1906sub new {
1716 my $class = shift; 1907 my $class = shift;
1717 1908
1718 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1780 1971
1781 if ($uni == 8) { 1972 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1790 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1792 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1793 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 1988 $self->emit ('escape');
1795 } elsif ($uni) { 1989 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1991 } else {
… …
1820 2014
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2016
1823 # byte-index to char-index 2017 # byte-index to char-index
1824 my $text = $self->{text}; 2018 my $text = $self->{text};
1825 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1827 2021
1828 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1829 $self->update; 2023 $self->update;
1830 2024
1831 1 2025 1
… …
1870 utf8::encode $text; 2064 utf8::encode $text;
1871 2065
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2067 }
1874 2068
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2069 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 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}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2072 glEnd;
1880 } 2073 }
1881} 2074}
1882 2075
1883package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1884 2077
1885our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1886 2079
1887use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1888 2081
1889sub invoke_key_down { 2082sub invoke_key_down {
1890 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1891 2084
1892 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
… …
1898 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2093 $self->emit (activate => $txt);
1901 $self->update; 2094 $self->update;
1902 2095
1903 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1906 } 2099 }
1907 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2104 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2106 }
1914 2107
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2111
1919 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2122 1
1930} 2123}
1931 2124
1932############################################################################# 2125#############################################################################
1933 2126
1934package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1935 2128
1936our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1937 2130
1938use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1939 2132
1940my @tex = 2133my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1943 2136
1944sub new { 2137sub new {
1945 my $class = shift; 2138 my $class = shift;
1946 2139
… …
1983 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1984} 2177}
1985 2178
1986############################################################################# 2179#############################################################################
1987 2180
2181package CFPlus::UI::CheckBox;
2182
2183our @ISA = CFPlus::UI::DrawBG::;
2184
2185my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2188
2189use CFPlus::OpenGL;
2190
2191sub new {
2192 my $class = shift;
2193
2194 $class->SUPER::new (
2195 padding_x => 2,
2196 padding_y => 2,
2197 fg => [1, 1, 1],
2198 active_fg => [1, 1, 0],
2199 bg => [0, 0, 0, 0.2],
2200 active_bg => [1, 1, 1, 0.5],
2201 state => 0,
2202 can_hover => 1,
2203 @_
2204 )
2205}
2206
2207sub size_request {
2208 my ($self) = @_;
2209
2210 (6) x 2
2211}
2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
2221sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_;
2223
2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2226 $self->toggle;
2227 } else {
2228 return 0
2229 }
2230
2231 1
2232}
2233
2234sub _draw {
2235 my ($self) = @_;
2236
2237 $self->SUPER::_draw;
2238
2239 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2240
2241 my ($w, $h) = @$self{qw(w h)};
2242
2243 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244
2245 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2246
2247 my $tex = $self->{state} ? $tex[1] : $tex[0];
2248
2249 glEnable GL_TEXTURE_2D;
2250 $tex->draw_quad_alpha (0, 0, $s, $s);
2251 glDisable GL_TEXTURE_2D;
2252}
2253
2254#############################################################################
2255
2256package CFPlus::UI::Image;
2257
2258our @ISA = CFPlus::UI::Base::;
2259
2260use CFPlus::OpenGL;
2261
2262our %texture_cache;
2263
2264sub new {
2265 my $class = shift;
2266
2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2271
2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2274
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277
2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2279
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281
2282 $self
2283}
2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2300sub size_request {
2301 my ($self) = @_;
2302
2303 ($self->{tex}{w}, $self->{tex}{h})
2304}
2305
2306sub _draw {
2307 my ($self) = @_;
2308
2309 my $tex = $self->{tex};
2310
2311 my ($w, $h) = ($self->{w}, $self->{h});
2312
2313 if ($self->{rot90}) {
2314 glRotate 90, 0, 0, 1;
2315 glTranslate 0, -$self->{w}, 0;
2316
2317 ($w, $h) = ($h, $w);
2318 }
2319
2320 glEnable GL_TEXTURE_2D;
2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322
2323 $tex->draw_quad (0, 0, $w, $h);
2324
2325 glDisable GL_TEXTURE_2D;
2326}
2327
2328#############################################################################
2329
1988package CFClient::UI::ImageButton; 2330package CFPlus::UI::ImageButton;
1989 2331
1990our @ISA = CFClient::UI::Image::; 2332our @ISA = CFPlus::UI::Image::;
1991 2333
1992use CFClient::OpenGL; 2334use CFPlus::OpenGL;
1993 2335
1994my %textures; 2336my %textures;
1995 2337
1996sub new { 2338sub new {
1997 my $class = shift; 2339 my $class = shift;
… …
2019 1 2361 1
2020} 2362}
2021 2363
2022############################################################################# 2364#############################################################################
2023 2365
2024package CFClient::UI::CheckBox;
2025
2026our @ISA = CFClient::UI::DrawBG::;
2027
2028my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032use CFClient::OpenGL;
2033
2034sub new {
2035 my $class = shift;
2036
2037 $class->SUPER::new (
2038 padding_x => 2,
2039 padding_y => 2,
2040 fg => [1, 1, 1],
2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
2044 state => 0,
2045 can_hover => 1,
2046 @_
2047 )
2048}
2049
2050sub size_request {
2051 my ($self) = @_;
2052
2053 (6) x 2
2054}
2055
2056sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_;
2058
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state};
2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
2067 1
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072
2073 $self->SUPER::_draw;
2074
2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085 glEnable GL_TEXTURE_2D;
2086 $tex->draw_quad_alpha (0, 0, $s, $s);
2087 glDisable GL_TEXTURE_2D;
2088}
2089
2090#############################################################################
2091
2092package CFClient::UI::Image; 2366package CFPlus::UI::VGauge;
2093 2367
2094our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097use Carp qw/confess/;
2098
2099our %loaded_images;
2100
2101sub new {
2102 my $class = shift;
2103
2104 my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108 $loaded_images{$self->{image}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113 Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116
2117 $self
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 ($self->{tex}->{w}, $self->{tex}->{h})
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 my $tex = $self->{tex};
2130
2131 my ($w, $h) = ($self->{w}, $self->{h});
2132
2133 if ($self->{rot90}) {
2134 glRotate 90, 0, 0, 1;
2135 glTranslate 0, -$self->{w}, 0;
2136
2137 ($w, $h) = ($h, $w);
2138 }
2139
2140 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143 $tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145 glDisable GL_TEXTURE_2D;
2146}
2147
2148#############################################################################
2149
2150package CFClient::UI::VGauge;
2151
2152our @ISA = CFClient::UI::Base::;
2153 2369
2154use List::Util qw(min max); 2370use List::Util qw(min max);
2155 2371
2156use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2157 2373
2158my %tex = ( 2374my %tex = (
2159 food => [ 2375 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2378 ],
2163 grace => [ 2379 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2382 ],
2167 hp => [ 2383 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2386 ],
2171 mana => [ 2387 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2390 ],
2175); 2391);
2176 2392
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2455
2240 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2457 my $h2 = $self->{h} * (1 - $ycut2);
2458 my $h3 = $self->{h};
2459
2460 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2461
2243 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
… …
2265 2484
2266 if ($t3) { 2485 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2492 glEnd;
2274 } 2493 }
2275 2494
2276 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2278} 2497}
2279 2498
2280############################################################################# 2499#############################################################################
2281 2500
2282package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2283 2502
2284our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2285 2504
2286sub new { 2505sub new {
2287 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2288 2507
2289 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2510 can_hover => 1,
2292 can_events => 1, 2511 can_events => 1,
2293 %arg, 2512 %arg,
2294 ); 2513 );
2295 2514
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2518
2300 $self 2519 $self
2301} 2520}
2302 2521
2303sub set_fontsize { 2522sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2325} 2544}
2326 2545
2327############################################################################# 2546#############################################################################
2328 2547
2329package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2330 2549
2331use strict; 2550use strict;
2332 2551
2333use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2334 2553
2335our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2336 2555
2337my @tex = 2556my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2340 2559
2341sub new { 2560sub new {
2342 my $class = shift; 2561 my $class = shift;
2343 2562
… …
2432 } 2651 }
2433 2652
2434 1 2653 1
2435} 2654}
2436 2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2664}
2665
2437sub update { 2666sub update {
2438 my ($self) = @_; 2667 my ($self) = @_;
2439 2668
2440 delete $self->{knob_w}; 2669 delete $self->{knob_w};
2441 $self->SUPER::update; 2670 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2489} 2718}
2490 2719
2491############################################################################# 2720#############################################################################
2492 2721
2493package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2494 2723
2495our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2496 2725
2497sub new { 2726sub new {
2498 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2499 2728
2500 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2501 2730
2502 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2734 to_value => sub { shift },
2506 from_value => sub { shift }, 2735 from_value => sub { shift },
2507 %arg, 2736 %arg,
2508 ); 2737 );
2509 2738
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2531 2760
2532############################################################################# 2761#############################################################################
2533 2762
2534package CFClient::UI::TextScroller; 2763package CFPlus::UI::TextScroller;
2535 2764
2536our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2537 2766
2538use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2539 2768
2540sub new { 2769sub new {
2541 my $class = shift; 2770 my $class = shift;
2542 2771
2543 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2544 fontsize => 1, 2773 fontsize => 1,
2545 can_events => 0, 2774 can_events => 1,
2546 indent => 0, 2775 indent => 0,
2547 #font => default_font 2776 #font => default_font
2548 @_, 2777 @_,
2549 2778
2550 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2551 par => [], 2780 par => [],
2552 height => 0, 2781 height => 0,
2553 children => [ 2782 children => [
2554 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2556 ], 2785 ],
2557 ); 2786 );
2558 2787
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2560 2789
… …
2566 2795
2567 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2797 $self->reflow;
2569} 2798}
2570 2799
2800sub size_request {
2801 my ($self) = @_;
2802
2803 my ($empty, $slider) = @{ $self->{children} };
2804
2805 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request
2807}
2808
2571sub invoke_size_allocate { 2809sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2573 2811
2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2814
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2817 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2818 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2819
2579 $self->reflow; 2820 $self->reflow;
2580 2821
2822 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2823 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2824}
2583 2825
2584sub text_size { 2826sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2834}
2835
2836sub get_layout {
2837 my ($self, $para) = @_;
2586 2838
2587 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2588 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2844 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2846 $layout->set_markup ($para->{markup});
2847
2848 $layout->set_shapes (
2849 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}}
2593 2852 );
2853
2594 $layout->size 2854 $layout
2595} 2855}
2596 2856
2597sub reflow { 2857sub reflow {
2598 my ($self) = @_; 2858 my ($self) = @_;
2599 2859
… …
2606 2866
2607 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2609} 2869}
2610 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2611sub clear { 2886sub clear {
2612 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2613 2891
2614 $self->{par} = []; 2892 $self->{par} = [];
2615 $self->{height} = 0; 2893 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2895}
2618 2896
2619sub add_paragraph { 2897sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2621 2899
2622 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2907 w => 1e10,
2908 wrapped => 1,
2909 };
2910
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para;
2913 }
2914
2915 $self->{need_reflow}++;
2916 $self->update;
2917}
2918
2919sub scroll_to_bottom {
2920 my ($self) = @_;
2921
2922 $self->{scroll_to} = $#{$self->{par}};
2923 $self->update;
2924}
2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2624 $self->{height} += $h; 2948 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 2950
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2629} 2957}
2630 2958
2631sub update { 2959sub update {
2632 my ($self) = @_; 2960 my ($self) = @_;
2633 2961
… …
2636 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2637 2965
2638 delete $self->{texture}; 2966 delete $self->{texture};
2639 2967
2640 $ROOT->on_post_alloc ($self => sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2972
2643 if (delete $self->{need_reflow}) {
2644 my $height = 0;
2645
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2662
2663 $self->{height} = $height;
2664
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667 delete $self->{texture};
2668 }
2669
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2974 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2673 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2675 2986
2676 my $y0 = $top; 2987 my $y0 = $top;
2677 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2678 2989
2679 my $y = 0;
2680
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2691 2993
2692 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 2996
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2699 2998
2700 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3000 my @s = $layout->get_shapes;
3001
3002 for (@w) {
3003 my ($dx, $dy) = splice @s, 0, 2, ();
3004
3005 $_->{x} = $dx + $para->{indent};
3006 $_->{y} = $dy + $y - $y0;
3007
3008 $_->draw;
3009 }
3010 }
2702 } 3011 }
2703 3012
2704 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3015 }
2706 3016
2707 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2708 }; 3018 };
2709 }); 3019 });
3020}
3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
2710} 3029}
2711 3030
2712sub _draw { 3031sub _draw {
2713 my ($self) = @_; 3032 my ($self) = @_;
2714 3033
… …
2717 glColor 0, 0, 0, 1; 3036 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3037 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2720 3039
2721 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2722
2723} 3041}
2724 3042
2725############################################################################# 3043#############################################################################
2726 3044
2727package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2728 3046
2729use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2730 3048
2731our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2732 3050
2733sub moveto { 3051sub moveto {
2734 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2735 3053
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3082 glPopMatrix;
2765} 3083}
2766 3084
2767############################################################################# 3085#############################################################################
2768 3086
2769package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2770 3088
2771our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2772 3090
2773sub new { 3091sub new {
2774 my $class = shift; 3092 my $class = shift;
2775 3093
2776 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2789} 3107}
2790 3108
2791############################################################################# 3109#############################################################################
2792 3110
2793package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2794 3112
2795our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2796 3114
2797use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2798 3116
2799sub new { 3117sub new {
2800 my $class = shift; 3118 my $class = shift;
2801 3119
2802 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2805 ) 3123 )
2806} 3124}
2807 3125
2808sub set_tooltip_from { 3126sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3131
2811 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2812 3133
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3139 }
2819 3140
2820 $tooltip =~ s/^\n+//; 3141 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3142 $tooltip =~ s/\n+$//;
2822 3143
2823 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3145 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3147 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3149 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3151 );
2831} 3152}
2832 3153
… …
2851 3172
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2854 or return; 3175 or return;
2855 3176
3177 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3179
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3181 if $x + $self->{w} > $self->{root}{w};
2860 3182
2861 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2862 }); 3187 });
2863} 3188}
2864 3189
2865sub _draw { 3190sub _draw {
2866 my ($self) = @_; 3191 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2891} 3216}
2892 3217
2893############################################################################# 3218#############################################################################
2894 3219
2895package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2896 3221
2897our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2898 3223
2899use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2900 3225
2901sub new { 3226sub new {
2902 my $class = shift; 3227 my $class = shift;
2903 3228
2904 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2939sub _draw { 3264sub _draw {
2940 my ($self) = @_; 3265 my ($self) = @_;
2941 3266
2942 return unless $::CONN; 3267 return unless $::CONN;
2943 3268
3269 $self->SUPER::_draw;
3270
2944 my $face; 3271 my $face;
2945 3272
2946 if ($self->{frame}) { 3273 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2948 3275
… …
2970 $self->SUPER::destroy; 3297 $self->SUPER::destroy;
2971} 3298}
2972 3299
2973############################################################################# 3300#############################################################################
2974 3301
2975package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2976 3303
2977our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2978 3305
2979# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2980 3307
2981############################################################################# 3308#############################################################################
2982 3309
2983package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2984 3311
2985our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2986 3313
2987use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2988 3315
2989sub new { 3316sub new {
2990 my $class = shift; 3317 my $class = shift;
2991 3318
2992 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2993 items => [], 3320 items => [],
2994 z => 100, 3321 z => 100,
2995 @_, 3322 @_,
2996 ); 3323 );
2997 3324
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3326
3000 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
3002 3329
3003 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
3004 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
3005 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3336 can_hover => 1,
3007 can_events => 1, 3337 can_events => 1,
3338 tooltip => $tooltip,
3339 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1),
3342 ],
3343 ;
3344
3345 } else {
3346 $widget = new CFPlus::UI::Label
3347 can_hover => 1,
3348 can_events => 1,
3008 markup => $widget, 3349 markup => $widget,
3009 tooltip => $tooltip 3350 tooltip => $tooltip;
3351 }
3010 } 3352 }
3011 3353
3012 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
3013 3355
3014 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
3057 1 3399 1
3058} 3400}
3059 3401
3060############################################################################# 3402#############################################################################
3061 3403
3062package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
3063 3405
3064our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
3065 3407
3066sub new { 3408sub new {
3067 my $class = shift; 3409 my $class = shift;
3068 3410
3069 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
3083 3425
3084 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3427 if @{ $self->{children} };
3086} 3428}
3087 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
3088sub set_current_page { 3436sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
3090 3438
3091 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3440 ? $page_or_widget
… …
3124 $self->{current}->draw; 3472 $self->{current}->draw;
3125} 3473}
3126 3474
3127############################################################################# 3475#############################################################################
3128 3476
3129package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3130 3478
3131our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3132 3480
3133sub new { 3481sub new {
3134 my $class = shift; 3482 my $class = shift;
3135 3483
3136 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3140 @_, 3488 @_,
3141 ); 3489 );
3142 3490
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3149sub add { 3497sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3151 3499
3152 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3153 3501
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3503 markup => $title,
3156 tooltip => $tooltip, 3504 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3506 );
3159 3507
3160 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3161} 3509}
3162 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3163sub set_current_page { 3517sub set_current_page {
3164 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3165 3519
3166 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3522}
3169 3523
3170############################################################################# 3524#############################################################################
3171 3525
3172package CFClient::UI::Combobox; 3526package CFPlus::UI::Selector;
3173 3527
3174use utf8; 3528use utf8;
3175 3529
3176our @ISA = CFClient::UI::Button::; 3530our @ISA = CFPlus::UI::Button::;
3177 3531
3178sub new { 3532sub new {
3179 my $class = shift; 3533 my $class = shift;
3180 3534
3181 my $self = $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3552 my ($value, $title, $tooltip) = @$_;
3199 3553
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3555 }
3202 3556
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3558}
3205 3559
3206sub _set_value { 3560sub _set_value {
3207 my ($self, $value) = @_; 3561 my ($self, $value) = @_;
3208 3562
… …
3223 $self->emit (changed => $value); 3577 $self->emit (changed => $value);
3224} 3578}
3225 3579
3226############################################################################# 3580#############################################################################
3227 3581
3228package CFClient::UI::Statusbox; 3582package CFPlus::UI::Statusbox;
3229 3583
3230our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::VBox::;
3231 3585
3232sub new { 3586sub new {
3233 my $class = shift; 3587 my $class = shift;
3234 3588
3235 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3247sub reorder { 3601sub reorder {
3248 my ($self) = @_; 3602 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3603 my $NOW = Time::HiRes::time;
3250 3604
3251 # freeze display when hovering over any label 3605 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3606 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3608 values %{ $self->{item} };
3255 3609
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3612 }
… …
3279 for ($short) { 3633 for ($short) {
3280 s/^\s+//; 3634 s/^\s+//;
3281 s/\s+/ /g; 3635 s/\s+/ /g;
3282 } 3636 }
3283 3637
3284 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3285 markup => $short, 3639 markup => $short,
3286 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3697 count => 1,
3344 %arg, 3698 %arg,
3345 }; 3699 };
3346 } 3700 }
3347 3701
3702 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3703 $self->reorder;
3704 });
3349} 3705}
3350 3706
3351sub reconfigure { 3707sub reconfigure {
3352 my ($self) = @_; 3708 my ($self) = @_;
3353 3709
… …
3366 $self->SUPER::destroy; 3722 $self->SUPER::destroy;
3367} 3723}
3368 3724
3369############################################################################# 3725#############################################################################
3370 3726
3371package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3372 3728
3373our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3374 3730
3375sub new { 3731sub new {
3376 my $class = shift; 3732 my $class = shift;
3377 3733
3378 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3380 @_, 3737 @_,
3381 ); 3738 );
3382 3739
3740 $self->set_sort_order (undef);
3741
3383 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3384} 3778}
3385 3779
3386sub set_items { 3780sub set_items {
3387 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3388 3782
3389 $self->{child}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3390 return unless $items; 3784 $self->update_items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409} 3785}
3410 3786
3411############################################################################# 3787#############################################################################
3412 3788
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub cfg_bind {
3478 my ($self, $mod, $sym, $cmds) = @_;
3479 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3480 ::update_bindings ();
3481}
3482
3483sub cfg_unbind {
3484 my ($self, $mod, $sym, $cmds) = @_;
3485 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3486 ::update_bindings ();
3487}
3488
3489sub commit {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 if ($sym != 0 && @$cmds > 0) {
3493 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3494 ."'. Don't forget 'Save Config'!");
3495 $self->{binding_change}->($mod, $sym, $cmds)
3496 if $self->{binding_change};
3497 } else {
3498 $::STATUSBOX->add ("No action bound, no key or action specified!");
3499 $self->{binding_cancel}->()
3500 if $self->{binding_cancel};
3501 }
3502}
3503
3504sub start {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("stop recording");
3508 $self->{recording} = 1;
3509 $self->clear_command_list;
3510 $::CONN->start_record if $::CONN;
3511}
3512
3513sub stop {
3514 my ($self) = @_;
3515
3516 $self->{rec_btn}->set_text ("start recording");
3517 $self->{recording} = 0;
3518
3519 my $rec;
3520 $rec = $::CONN->stop_record if $::CONN;
3521 return unless ref $rec eq 'ARRAY';
3522 $self->set_command_list ($rec);
3523}
3524
3525
3526sub ask_for_bind_and_commit {
3527 my ($self) = @_;
3528 $self->ask_for_bind (1);
3529}
3530
3531sub ask_for_bind {
3532 my ($self, $commit, $end_cb) = @_;
3533
3534 CFClient::Binder::open_binding_dialog (sub {
3535 my ($mod, $sym) = @_;
3536 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3537 $self->update_binding_widgets;
3538 $self->commit if $commit;
3539 $end_cb->() if $end_cb;
3540 });
3541}
3542
3543# $mod and $sym are the modifiers and key symbol
3544# $cmds is a array ref of strings (the commands)
3545# $cb is the callback that is executed on OK
3546# $ccb is the callback that is executed on CANCEL and
3547# when the binding was unsuccessful on OK
3548sub set_binding {
3549 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3550
3551 $self->clear_command_list;
3552 $self->{recording} = 0;
3553 $self->{rec_btn}->set_text ("start recording");
3554
3555 $self->{binding} = [$mod, $sym];
3556 $self->{commands} = $cmds;
3557
3558 $self->{binding_change} = $cb;
3559 $self->{binding_cancel} = $ccb;
3560
3561 $self->update_binding_widgets;
3562}
3563
3564# this is a shortcut method that asks for a binding
3565# and then just binds it.
3566sub do_quick_binding {
3567 my ($self, $cmds, $end_cb) = @_;
3568 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3569 $self->ask_for_bind (1, $end_cb);
3570}
3571
3572sub update_binding_widgets {
3573 my ($self) = @_;
3574 my ($mod, $sym, $cmds) = $self->get_binding;
3575 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3576 $self->set_command_list ($cmds);
3577}
3578
3579sub get_binding {
3580 my ($self) = @_;
3581 return (
3582 $self->{binding}->[0],
3583 $self->{binding}->[1],
3584 [ grep { defined $_ } @{$self->{commands}} ]
3585 );
3586}
3587
3588sub clear_command_list {
3589 my ($self) = @_;
3590 $self->{cmdbox}->clear ();
3591}
3592
3593sub set_command_list {
3594 my ($self, $cmds) = @_;
3595
3596 $self->{cmdbox}->clear ();
3597 $self->{commands} = $cmds;
3598
3599 my $idx = 0;
3600
3601 for (@$cmds) {
3602 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3603
3604 my $i = $idx;
3605 $hb->add (new CFClient::UI::Label text => $_);
3606 $hb->add (new CFClient::UI::Button
3607 text => "delete",
3608 tooltip => "Deletes the action from the record",
3609 on_activate => sub {
3610 $self->{cmdbox}->remove ($hb);
3611 $cmds->[$i] = undef;
3612 });
3613
3614
3615 $idx++
3616 }
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3622 3790
3623our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3624 3792
3625sub new { 3793sub new {
3626 my $class = shift; 3794 my $class = shift;
3627 3795
3628 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3646 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3647 3815
3648sub rebuild_spell_list { 3816sub rebuild_spell_list {
3649 my ($self) = @_; 3817 my ($self) = @_;
3650 3818
3651 $CFClient::UI::ROOT->on_refresh ($self => sub { 3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3652 $self->clear; 3820 $self->clear;
3653 3821
3654 return unless $::CONN; 3822 return unless $::CONN;
3655 3823
3656 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3657 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3658 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3659 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3660 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3661 3829
3662 my $row = 0; 3830 my $row = 0;
3663 3831
3664 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3665 my $spell = $self->{spell}{$_}; 3833 my $spell = $self->{spell}{$_};
… …
3672 if ($ev->{button} == 1) { 3840 if ($ev->{button} == 1) {
3673 $::CONN->user_send ("cast $spell->{name}"); 3841 $::CONN->user_send ("cast $spell->{name}");
3674 } elsif ($ev->{button} == 2) { 3842 } elsif ($ev->{button} == 2) {
3675 $::CONN->user_send ("invoke $spell->{name}"); 3843 $::CONN->user_send ("invoke $spell->{name}");
3676 } elsif ($ev->{button} == 3) { 3844 } elsif ($ev->{button} == 3) {
3677 (new CFClient::UI::Menu 3845 (new CFPlus::UI::Menu
3678 items => [ 3846 items => [
3679 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3680 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3681 ], 3849 ],
3682 )->popup ($ev); 3850 )->popup ($ev);
3683 } else { 3851 } else {
3684 return 0; 3852 return 0;
3685 } 3853 }
3686 3854
3687 1 3855 1
3688 }; 3856 };
3689 3857
3690 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3691 3859
3692 #TODO: add path info to tooltip 3860 #TODO: add path info to tooltip
3693 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3694 3862
3695 $self->add (0, $row, new CFClient::UI::Face 3863 $self->add (0, $row, new CFPlus::UI::Face
3696 face => $spell->{face}, 3864 face => $spell->{face},
3697 can_hover => 1, 3865 can_hover => 1,
3698 can_events => 1, 3866 can_events => 1,
3699 tooltip => $tooltip, 3867 tooltip => $tooltip,
3700 on_button_down => $spell_cb, 3868 on_button_down => $spell_cb,
3701 ); 3869 );
3702 3870
3703 $self->add (1, $row, new CFClient::UI::Label 3871 $self->add (1, $row, new CFPlus::UI::Label
3704 expand => 1, 3872 expand => 1,
3705 text => $spell->{name}, 3873 text => $spell->{name},
3706 can_hover => 1, 3874 can_hover => 1,
3707 can_events => 1, 3875 can_events => 1,
3708 tooltip => $tooltip, 3876 tooltip => $tooltip,
3709 on_button_down => $spell_cb, 3877 on_button_down => $spell_cb,
3710 ); 3878 );
3711 3879
3712 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3713 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3714 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3715 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3716 } 3884 }
3717 }); 3885 });
3718} 3886}
3719 3887
3720sub add_spell { 3888sub add_spell {
… …
3738 $self->rebuild_spell_list; 3906 $self->rebuild_spell_list;
3739} 3907}
3740 3908
3741############################################################################# 3909#############################################################################
3742 3910
3743package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3744 3912
3745our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3746 3914
3747use List::Util qw(min max); 3915use List::Util qw(min max);
3748 3916
3749use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3750 3918
3751sub new { 3919sub new {
3752 my $class = shift; 3920 my $class = shift;
3753 3921
3754 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3930 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3931 4099
3932 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3933 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
3934 4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111
3935 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3936 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3937 4114
3938 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3939 $widget->{old_w} = $widget->{w}; 4116 $widget->{old_w} = $widget->{w};
… …
3962 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3963 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3964 glLoadIdentity; 4141 glLoadIdentity;
3965 4142
3966 { 4143 {
3967 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3968 4145
3969 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3970 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3971 }
3972 4148
3973 $self->_draw; 4149 $self->_draw;
4150 }
3974} 4151}
3975 4152
3976############################################################################# 4153#############################################################################
3977 4154
3978package CFClient::UI; 4155package CFPlus::UI;
3979 4156
3980$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3981$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3982 4159
39831 41601
3984 4161

Diff Legend

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