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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 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 dislike duplication
520 # and needlessly verbose code, too.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
475 #d##TODO# stop propagating at first true, do not use sum 528 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 532}
480 533
481sub find_widget { 534sub find_widget {
482 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
483 536
… …
535 return unless $self->{h} && $self->{w}; 588 return unless $self->{h} && $self->{w};
536 589
537 # update screen rectangle 590 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 591 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 592 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 593
543 # skip widgets that are entirely outside the drawing area 594 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 597
… …
569 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
572 glEnd; 623 glEnd;
573 glPopMatrix; 624 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 } 626 }
576 627
577 $self->_draw; 628 $self->_draw;
578 glPopMatrix; 629 glPopMatrix;
579} 630}
… …
585} 636}
586 637
587sub DESTROY { 638sub DESTROY {
588 my ($self) = @_; 639 my ($self) = @_;
589 640
641 return if CFPlus::in_destruct;
642
590 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
591 644
592 eval { $self->destroy }; 645 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 647}
595 648
596############################################################################# 649#############################################################################
597 650
598package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
599 652
600our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
601 654
602use strict; 655use strict;
603use CFClient::OpenGL; 656use CFPlus::OpenGL;
604 657
605sub new { 658sub new {
606 my $class = shift; 659 my $class = shift;
607 660
608 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
639 } 692 }
640} 693}
641 694
642############################################################################# 695#############################################################################
643 696
644package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
645 698
646our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
647 700
648sub new { 701sub new {
649 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
651} 704}
… …
658 711
659sub draw { } 712sub draw { }
660 713
661############################################################################# 714#############################################################################
662 715
663package CFClient::UI::Container; 716package CFPlus::UI::Container;
664 717
665our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
666 719
667sub new { 720sub new {
668 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
669 722
670 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
679 if $children; 732 if $children;
680 733
681 $self 734 $self
682} 735}
683 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
684sub add { 745sub add {
685 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
686 747
687 $_->set_parent ($self) 748 $_->set_parent ($self)
688 for @widgets; 749 for @widgets;
… …
748 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
749} 810}
750 811
751############################################################################# 812#############################################################################
752 813
753package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
754 815
755our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
756 817
757sub new { 818sub new {
758 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
759 820
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 822
762 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
763} 824}
764 825
765sub add { 826sub add {
… …
772sub remove { 833sub remove {
773 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
774 835
775 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
776 837
777 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 839 unless @{$self->{children}};
779} 840}
780 841
781sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
782 843
… …
794 855
795############################################################################# 856#############################################################################
796 857
797# back-buffered drawing area 858# back-buffered drawing area
798 859
799package CFClient::UI::Window; 860package CFPlus::UI::Window;
800 861
801our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
802 863
803use CFClient::OpenGL; 864use CFPlus::OpenGL;
804 865
805sub new { 866sub new {
806 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
807 868
808 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
830} 891}
831 892
832sub render_child { 893sub render_child {
833 my ($self) = @_; 894 my ($self) = @_;
834 895
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
838 899
839 { 900 {
840 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
841 902
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
844 } 905 }
845 906
… …
864 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
865} 926}
866 927
867############################################################################# 928#############################################################################
868 929
869package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
870 931
871our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
872 933
873sub new { 934sub new {
874 my $class = shift; 935 my $class = shift;
875 936
876 $class->SUPER::new ( 937 $class->SUPER::new (
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 999 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1001 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1003 }
943} 1004}
944 1005
945sub _render { 1006sub _render {
946 my ($self) = @_; 1007 my ($self) = @_;
947 1008
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1009 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1011
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1013
953 $self->SUPER::_render; 1014 $self->SUPER::_render;
954} 1015}
955 1016
956############################################################################# 1017#############################################################################
957 1018
958package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
959 1020
960our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
961 1022
962sub new { 1023sub new {
963 my ($class, %arg) = @_; 1024 my ($class, %arg) = @_;
964 1025
965 my $child = delete $arg{child}; 1026 my $child = delete $arg{child};
966 1027
967 my $self; 1028 my $self;
968 1029
969 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1031 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1033 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
974 }, 1035 },
975 ; 1036 ;
976 1037
977 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1040 can_events => 1,
979 slider => $slider, 1041 slider => $slider,
980 %arg, 1042 %arg,
981 ); 1043 );
982 1044
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1045 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1046 $self->add ($child) if $child;
985 1047
986 $self 1048 $self
987} 1049}
988 1050
1051#TODO# update range on size_allocate depending on child
1052
989sub add { 1053sub add {
990 my ($self, $widget) = @_; 1054 my ($self, $widget) = @_;
991 1055
992 $self->{vp}->add ($self->{child} = $widget); 1056 $self->{vp}->add ($self->{child} = $widget);
993} 1057}
994 1058
1059sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_;
1061
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev);
1065
1066 1
1067}
1068
1069sub update_slider {
1070 my ($self) = @_;
1071
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1073}
1074
995sub update { 1075sub update {
996 my ($self) = @_; 1076 my ($self) = @_;
997 1077
998 $self->SUPER::update; 1078 $self->SUPER::update;
999 1079
1000 # todo: overwrite size_allocate of child 1080 $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} 1081}
1004 1082
1005sub invoke_size_allocate { 1083sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
1007 1085
1008 my $child = $self->{vp}->child; 1086 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1087
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1088 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1089}
1013 1090
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1091#############################################################################
1018 1092
1019package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
1020 1094
1021our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
1022 1096
1023use CFClient::OpenGL; 1097use CFPlus::OpenGL;
1024 1098
1025sub new { 1099sub new {
1026 my $class = shift; 1100 my $class = shift;
1027 1101
1028 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1055} 1129}
1056 1130
1057############################################################################# 1131#############################################################################
1058 1132
1059package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1060 1134
1061our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1062 1136
1063use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1064 1138
1065my $bg = 1139my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1068 1142
1069my @border = 1143my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 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); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1146
1073sub new { 1147sub new {
1074 my ($class, %arg) = @_; 1148 my ($class, %arg) = @_;
1075 1149
1076 my $self = $class->SUPER::new ( 1150 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1151 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1152 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1153 border => 0.6,
1080 can_events => 1, 1154 can_events => 1,
1081 min_w => 16, 1155 min_w => 64,
1082 min_h => 16, 1156 min_h => 32,
1083 %arg, 1157 %arg,
1084 ); 1158 );
1085 1159
1086 $self->{title_widget} = new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1161 align => 0,
1088 valign => 1, 1162 valign => 1,
1089 text => $self->{title}, 1163 text => $self->{title},
1090 fontsize => $self->{border}, 1164 fontsize => $self->{border},
1091 if exists $self->{title}; 1165 if exists $self->{title};
1092 1166
1093 if ($self->{has_close_button}) { 1167 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1168 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1169 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1170 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1171 on_activate => sub { $self->emit ("delete") };
1098 1172
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1174 }
1101 1175
1102 $self 1176 $self
1103} 1177}
1104 1178
1105sub add { 1179sub add {
1106 my ($self, @widgets) = @_; 1180 my ($self, @widgets) = @_;
1107 1181
1108 $self->SUPER::add (@widgets); 1182 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1183 $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}; 1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1185}
1112 1186
1113sub border { 1187sub border {
1114 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1115} 1189}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1222 $self->child->configure ($border, $border, $w, $h);
1149 1223
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1224 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1225 if $self->{close_button};
1152 1226
1227 1
1228}
1229
1230sub invoke_delete {
1231 my ($self) = @_;
1232
1233 $self->hide;
1234
1153 1 1235 1
1154} 1236}
1155 1237
1156sub invoke_button_down { 1238sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1298
1217 ! ! $self->{motion} 1299 ! ! $self->{motion}
1218} 1300}
1219 1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1308}
1309
1220sub _draw { 1310sub _draw {
1221 my ($self) = @_; 1311 my ($self) = @_;
1222 1312
1223 my $child = $self->{children}[0]; 1313 my $child = $self->{children}[0];
1224 1314
… …
1261 if $self->{close_button}; 1351 if $self->{close_button};
1262} 1352}
1263 1353
1264############################################################################# 1354#############################################################################
1265 1355
1266package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1267 1357
1268our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1269 1359
1270use List::Util qw(max sum); 1360use List::Util qw(max sum);
1271 1361
1272use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1273 1363
1274sub new { 1364sub new {
1275 my $class = shift; 1365 my $class = shift;
1276 1366
1277 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1283sub children { 1373sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1375}
1286 1376
1287sub add { 1377sub add {
1288 my ($self, $x, $y, $child) = @_; 1378 my ($self) = shift;
1289 1379
1380 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1382 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1383 $self->{children}[$y][$x] = $child;
1384 }
1292 1385
1386 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1388 $self->realloc;
1294} 1389}
1295 1390
1296sub remove { 1391sub remove {
1297 my ($self, $child) = @_; 1392 my ($self, $child) = @_;
… …
1362 1457
1363 # linearly scale sizes 1458 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1461
1367 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1368 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1369 1464
1370 my $y; 1465 my $y;
1371 1466
1372 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1416 } 1511 }
1417} 1512}
1418 1513
1419############################################################################# 1514#############################################################################
1420 1515
1421package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1422 1517
1423our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1424 1519
1425sub size_request { 1520sub size_request {
1426 my ($self) = @_; 1521 my ($self) = @_;
1427 1522
1428 $self->{vertical} 1523 $self->{vertical}
… …
1438 1533
1439sub invoke_size_allocate { 1534sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1535 my ($self, $w, $h) = @_;
1441 1536
1442 my $space = $self->{vertical} ? $h : $w; 1537 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1538 my @children = $self->visible_children;
1444 1539
1445 my @req; 1540 my @req;
1446 1541
1447 if ($self->{homogeneous}) { 1542 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1543 @req = ($space / (@children || 1)) x @children;
1449 } else { 1544 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1545 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1546 my $req = List::Util::sum @req;
1452 1547
1453 if ($req > $space) { 1548 if ($req > $space) {
1454 # ah well, not enough space 1549 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1550 $_ *= $space / $req for @req;
1456 } else { 1551 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1552 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1553
1459 $space = ($space - $req) / $expand; # remaining space to give away 1554 $space = ($space - $req) / $expand; # remaining space to give away
1460 1555
1461 $req[$_] += $space * $children->[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1557 for 0 .. $#children;
1463 } 1558 }
1464 } 1559 }
1465 1560
1466 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1467 1562
1468 my $pos = 0; 1563 my $pos = 0;
1469 for (0 .. $#$children) { 1564 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1567
1473 $pos += $alloc; 1568 $pos += $alloc;
1474 } 1569 }
1475 1570
1476 1 1571 1
1477} 1572}
1478 1573
1479############################################################################# 1574#############################################################################
1480 1575
1481package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1482 1577
1483our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1484 1579
1485sub new { 1580sub new {
1486 my $class = shift; 1581 my $class = shift;
1487 1582
1488 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1491 ) 1586 )
1492} 1587}
1493 1588
1494############################################################################# 1589#############################################################################
1495 1590
1496package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1497 1592
1498our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1499 1594
1500sub new { 1595sub new {
1501 my $class = shift; 1596 my $class = shift;
1502 1597
1503 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1506 ) 1601 )
1507} 1602}
1508 1603
1509############################################################################# 1604#############################################################################
1510 1605
1511package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1512 1607
1513our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1514 1609
1515use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1516 1611
1517sub new { 1612sub new {
1518 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1519 1614
1520 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1524 #font => default_font 1619 #font => default_font
1525 #text => initial text 1620 #text => initial text
1526 #markup => initial narkup 1621 #markup => initial narkup
1527 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1528 ellipsise => 3, # end 1623 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1624 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1625 fontsize => 1,
1531 align => -1, 1626 align => -1,
1532 valign => -1, 1627 valign => -1,
1533 padding_x => 2, 1628 padding_x => 2,
1534 padding_y => 2, 1629 padding_y => 2,
1535 can_events => 0, 1630 can_events => 0,
1536 %arg 1631 %arg
1537 ); 1632 );
1538 1633
1539 if (exists $self->{template}) { 1634 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1635 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1636 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1637 $self->{template} = $layout;
1543 } 1638 }
1544 1639
1545 if (exists $self->{markup}) { 1640 if (exists $self->{markup}) {
… …
1549 } 1644 }
1550 1645
1551 $self 1646 $self
1552} 1647}
1553 1648
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1649sub update {
1565 my ($self) = @_; 1650 my ($self) = @_;
1566 1651
1567 delete $self->{texture}; 1652 delete $self->{texture};
1568 $self->SUPER::update; 1653 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1664 my ($self, $text) = @_;
1580 1665
1581 return if $self->{text} eq "T$text"; 1666 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1667 $self->{text} = "T$text";
1583 1668
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1669 $self->{layout}->set_text ($text);
1586 1670
1587 delete $self->{size_req}; 1671 delete $self->{size_req};
1588 $self->realloc; 1672 $self->realloc;
1589 $self->update; 1673 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1679 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1680 $self->{text} = "M$markup";
1597 1681
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1682 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1683
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1684 $self->{layout}->set_markup ($markup);
1602 1685
1603 delete $self->{size_req}; 1686 delete $self->{size_req};
1604 $self->realloc; 1687 $self->realloc;
1605 $self->update; 1688 $self->update;
… …
1617 1700
1618 my ($w, $h) = $self->{layout}->size; 1701 my ($w, $h) = $self->{layout}->size;
1619 1702
1620 if (exists $self->{template}) { 1703 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1704 $self->{template}->set_font ($self->{font}) if $self->{font};
1705 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1707
1624 my ($w2, $h2) = $self->{template}->size; 1708 my ($w2, $h2) = $self->{template}->size;
1625 1709
1626 $w = List::Util::max $w, $w2; 1710 $w = List::Util::max $w, $w2;
… …
1631 }; 1715 };
1632 1716
1633 @{ $self->{size_req} } 1717 @{ $self->{size_req} }
1634} 1718}
1635 1719
1720sub baseline_shift {
1721 $_[0]{layout}->descent
1722}
1723
1636sub invoke_size_allocate { 1724sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1725 my ($self, $w, $h) = @_;
1638 1726
1639 delete $self->{ox}; 1727 delete $self->{ox};
1640 1728
… …
1646 1734
1647sub set_fontsize { 1735sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1736 my ($self, $fontsize) = @_;
1649 1737
1650 $self->{fontsize} = $fontsize; 1738 $self->{fontsize} = $fontsize;
1739 delete $self->{size_req};
1651 delete $self->{texture}; 1740 delete $self->{texture};
1652 1741
1653 $self->realloc; 1742 $self->realloc;
1654} 1743}
1655 1744
1656sub reconfigure { 1745sub reconfigure {
1657 my ($self) = @_; 1746 my ($self) = @_;
1658 1747
1659 delete $self->{size_req}; 1748 delete $self->{size_req};
1749 delete $self->{texture};
1660 1750
1661 $self->SUPER::reconfigure; 1751 $self->SUPER::reconfigure;
1662} 1752}
1663 1753
1664sub _draw { 1754sub _draw {
1665 my ($self) = @_; 1755 my ($self) = @_;
1666 1756
1667 $self->SUPER::_draw; # draw background, if applicable 1757 $self->SUPER::_draw; # draw background, if applicable
1668 1758
1669 my $tex = $self->{texture} ||= do { 1759 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1760 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1761 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1762 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1763 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1764 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1765 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1766
1677 new_from_layout CFClient::Texture $self->{layout} 1767 [$self->{layout}->size]
1678 }; 1768 };
1679 1769
1680 unless (exists $self->{ox}) { 1770 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1771 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1772 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1773 : ($self->{w} - $size->[0]) * 0.5);
1684 1774
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1777 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1778 };
1689 1779
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1782
1695 if ($tex->{format} == GL_ALPHA) { 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1784}
1706 1785
1707############################################################################# 1786#############################################################################
1708 1787
1709package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1710 1789
1711our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1712 1791
1713use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1714 1793
1715sub new { 1794sub new {
1716 my $class = shift; 1795 my $class = shift;
1717 1796
1718 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1780 1859
1781 if ($uni == 8) { 1860 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1790 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1792 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 1873 $self->emit ('escape');
1795 } elsif ($uni) { 1874 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
… …
1820 1899
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1901
1823 # byte-index to char-index 1902 # byte-index to char-index
1824 my $text = $self->{text}; 1903 my $text = $self->{text};
1825 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1827 1906
1828 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1829 $self->update; 1908 $self->update;
1830 1909
1831 1 1910 1
… …
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 1958 glEnd;
1880 } 1959 }
1881} 1960}
1882 1961
1883package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1884 1963
1885our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1886 1965
1887use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1888 1967
1889sub invoke_key_down { 1968sub invoke_key_down {
1890 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1891 1970
1892 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
… …
1898 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 1979 $self->emit (activate => $txt);
1901 $self->update; 1980 $self->update;
1902 1981
1903 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1906 } 1985 }
1907 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 1990 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 1992 }
1914 1993
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 1997
1919 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2008 1
1930} 2009}
1931 2010
1932############################################################################# 2011#############################################################################
1933 2012
1934package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1935 2014
1936our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1937 2016
1938use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1939 2018
1940my @tex = 2019my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1943 2022
1944sub new { 2023sub new {
1945 my $class = shift; 2024 my $class = shift;
1946 2025
… …
1983 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1984} 2063}
1985 2064
1986############################################################################# 2065#############################################################################
1987 2066
2067package CFPlus::UI::CheckBox;
2068
2069our @ISA = CFPlus::UI::DrawBG::;
2070
2071my @tex =
2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2074
2075use CFPlus::OpenGL;
2076
2077sub new {
2078 my $class = shift;
2079
2080 $class->SUPER::new (
2081 padding_x => 2,
2082 padding_y => 2,
2083 fg => [1, 1, 1],
2084 active_fg => [1, 1, 0],
2085 bg => [0, 0, 0, 0.2],
2086 active_bg => [1, 1, 1, 0.5],
2087 state => 0,
2088 can_hover => 1,
2089 @_
2090 )
2091}
2092
2093sub size_request {
2094 my ($self) = @_;
2095
2096 (6) x 2
2097}
2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
2107sub invoke_button_down {
2108 my ($self, $ev, $x, $y) = @_;
2109
2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2112 $self->toggle;
2113 } else {
2114 return 0
2115 }
2116
2117 1
2118}
2119
2120sub _draw {
2121 my ($self) = @_;
2122
2123 $self->SUPER::_draw;
2124
2125 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2126
2127 my ($w, $h) = @$self{qw(w h)};
2128
2129 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2130
2131 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2132
2133 my $tex = $self->{state} ? $tex[1] : $tex[0];
2134
2135 glEnable GL_TEXTURE_2D;
2136 $tex->draw_quad_alpha (0, 0, $s, $s);
2137 glDisable GL_TEXTURE_2D;
2138}
2139
2140#############################################################################
2141
2142package CFPlus::UI::Image;
2143
2144our @ISA = CFPlus::UI::Base::;
2145
2146use CFPlus::OpenGL;
2147
2148our %texture_cache;
2149
2150sub new {
2151 my $class = shift;
2152
2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
2157
2158 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required";
2160
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163
2164 Scalar::Util::weaken $texture_cache{$self->{path}};
2165
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167
2168 $self
2169}
2170
2171sub STORABLE_freeze {
2172 my ($self, $cloning) = @_;
2173
2174 $self->{path}
2175 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2176
2177 $self->{path}
2178}
2179
2180sub STORABLE_attach {
2181 my ($self, $cloning, $path) = @_;
2182
2183 $self->new (path => $path)
2184}
2185
2186sub size_request {
2187 my ($self) = @_;
2188
2189 ($self->{tex}{w}, $self->{tex}{h})
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194
2195 my $tex = $self->{tex};
2196
2197 my ($w, $h) = ($self->{w}, $self->{h});
2198
2199 if ($self->{rot90}) {
2200 glRotate 90, 0, 0, 1;
2201 glTranslate 0, -$self->{w}, 0;
2202
2203 ($w, $h) = ($h, $w);
2204 }
2205
2206 glEnable GL_TEXTURE_2D;
2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209 $tex->draw_quad (0, 0, $w, $h);
2210
2211 glDisable GL_TEXTURE_2D;
2212}
2213
2214#############################################################################
2215
1988package CFClient::UI::ImageButton; 2216package CFPlus::UI::ImageButton;
1989 2217
1990our @ISA = CFClient::UI::Image::; 2218our @ISA = CFPlus::UI::Image::;
1991 2219
1992use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1993 2221
1994my %textures; 2222my %textures;
1995 2223
1996sub new { 2224sub new {
1997 my $class = shift; 2225 my $class = shift;
… …
2019 1 2247 1
2020} 2248}
2021 2249
2022############################################################################# 2250#############################################################################
2023 2251
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; 2252package CFPlus::UI::VGauge;
2093 2253
2094our @ISA = CFClient::UI::Base::; 2254our @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 2255
2154use List::Util qw(min max); 2256use List::Util qw(min max);
2155 2257
2156use CFClient::OpenGL; 2258use CFPlus::OpenGL;
2157 2259
2158my %tex = ( 2260my %tex = (
2159 food => [ 2261 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2264 ],
2163 grace => [ 2265 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 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/ 2267 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2268 ],
2167 hp => [ 2269 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2272 ],
2171 mana => [ 2273 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 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/ 2275 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2276 ],
2175); 2277);
2176 2278
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2341
2240 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2343 my $h2 = $self->{h} * (1 - $ycut2);
2344 my $h3 = $self->{h};
2345
2346 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2347
2243 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
… …
2265 2370
2266 if ($t3) { 2371 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2378 glEnd;
2274 } 2379 }
2275 2380
2276 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2278} 2383}
2279 2384
2280############################################################################# 2385#############################################################################
2281 2386
2282package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2283 2388
2284our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2285 2390
2286sub new { 2391sub new {
2287 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2288 2393
2289 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2396 can_hover => 1,
2292 can_events => 1, 2397 can_events => 1,
2293 %arg, 2398 %arg,
2294 ); 2399 );
2295 2400
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2401 $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); 2402 $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"); 2403 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2404
2300 $self 2405 $self
2301} 2406}
2302 2407
2303sub set_fontsize { 2408sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2325} 2430}
2326 2431
2327############################################################################# 2432#############################################################################
2328 2433
2329package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2330 2435
2331use strict; 2436use strict;
2332 2437
2333use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2334 2439
2335our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2336 2441
2337my @tex = 2442my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2340 2445
2341sub new { 2446sub new {
2342 my $class = shift; 2447 my $class = shift;
2343 2448
… …
2432 } 2537 }
2433 2538
2434 1 2539 1
2435} 2540}
2436 2541
2542sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_;
2544
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2548
2549 ! ! $delta
2550}
2551
2437sub update { 2552sub update {
2438 my ($self) = @_; 2553 my ($self) = @_;
2439 2554
2440 delete $self->{knob_w}; 2555 delete $self->{knob_w};
2441 $self->SUPER::update; 2556 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2489} 2604}
2490 2605
2491############################################################################# 2606#############################################################################
2492 2607
2493package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2494 2609
2495our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2496 2611
2497sub new { 2612sub new {
2498 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2499 2614
2500 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2501 2616
2502 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2620 to_value => sub { shift },
2506 from_value => sub { shift }, 2621 from_value => sub { shift },
2507 %arg, 2622 %arg,
2508 ); 2623 );
2509 2624
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2531 2646
2532############################################################################# 2647#############################################################################
2533 2648
2534package CFClient::UI::TextScroller; 2649package CFPlus::UI::TextScroller;
2535 2650
2536our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2537 2652
2538use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2539 2654
2540sub new { 2655sub new {
2541 my $class = shift; 2656 my $class = shift;
2542 2657
2543 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2544 fontsize => 1, 2659 fontsize => 1,
2545 can_events => 0, 2660 can_events => 1,
2546 indent => 0, 2661 indent => 0,
2547 #font => default_font 2662 #font => default_font
2548 @_, 2663 @_,
2549 2664
2550 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2551 par => [], 2666 par => [],
2552 height => 0, 2667 height => 0,
2553 children => [ 2668 children => [
2554 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2556 ], 2671 ],
2557 ); 2672 );
2558 2673
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2560 2675
… …
2566 2681
2567 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2683 $self->reflow;
2569} 2684}
2570 2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 my ($empty, $slider) = @{ $self->{children} };
2690
2691 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request
2693}
2694
2571sub invoke_size_allocate { 2695sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2573 2697
2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2700
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2705
2579 $self->reflow; 2706 $self->reflow;
2580 2707
2708 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2709 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2710}
2583 2711
2584sub text_size { 2712sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 2713 my ($self, $ev) = @_;
2714
2715 return 0 unless $ev->{dy}; # only vertical movements
2716
2717 $self->{children}[1]->emit (mouse_wheel => $ev);
2718
2719 1
2720}
2721
2722sub get_layout {
2723 my ($self, $para) = @_;
2586 2724
2587 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2588 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2732 $layout->set_markup ($para->{markup});
2733
2734 $layout->set_shapes (
2735 map
2736 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2737 @{$para->{widget}}
2593 2738 );
2739
2594 $layout->size 2740 $layout
2595} 2741}
2596 2742
2597sub reflow { 2743sub reflow {
2598 my ($self) = @_; 2744 my ($self) = @_;
2599 2745
… …
2608 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2609} 2755}
2610 2756
2611sub clear { 2757sub clear {
2612 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2613 2762
2614 $self->{par} = []; 2763 $self->{par} = [];
2615 $self->{height} = 0; 2764 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2766}
2618 2767
2619sub add_paragraph { 2768sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2621 2770
2622 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2624 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2626 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2627 2781
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para;
2784 }
2785
2786 $self->{need_reflow}++;
2787 $self->update;
2788}
2789
2790sub scroll_to_bottom {
2791 my ($self) = @_;
2792
2793 $self->{scroll_to_bottom} = 1;
2794 $self->update;
2629} 2795}
2630 2796
2631sub update { 2797sub update {
2632 my ($self) = @_; 2798 my ($self) = @_;
2633 2799
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2808
2643 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2810 my $height = 0;
2645 2811
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2816
2657 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2658 } 2820 }
2659 2821
2660 $height += $_->[1]; 2822 $height += $para->{h};
2661 } 2823 }
2662 2824
2663 $self->{height} = $height; 2825 $self->{height} = $height;
2664 2826
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2828
2667 delete $self->{texture}; 2829 delete $self->{texture};
2668 } 2830 }
2669 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2837 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2673 2839
2674 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2675 2841
2676 my $y0 = $top; 2842 my $y0 = $top;
2677 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2678 2844
2679 my $y = 0; 2845 my $y = 0;
2680 2846
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}}) { 2847 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2848 my $h = $para->{h};
2691 2849
2692 if ($y0 < $y + $h && $y < $y1) { 2850 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] });
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 2851
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2699 2853
2700 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2855
2856 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes;
2858
2859 for (@w) {
2860 my ($dx, $dy) = splice @s, 0, 2, ();
2861
2862 $_->{x} = $dx + $para->{indent};
2863 $_->{y} = $dy + $y - $y0;
2864
2865 $_->draw;
2866 }
2867 }
2702 } 2868 }
2703 2869
2704 $y += $h; 2870 $y += $h;
2705 } 2871 }
2706
2707 glDisable GL_BLEND;
2708 }; 2872 };
2709 }); 2873 });
2874}
2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2710} 2883}
2711 2884
2712sub _draw { 2885sub _draw {
2713 my ($self) = @_; 2886 my ($self) = @_;
2714 2887
… …
2717 glColor 0, 0, 0, 1; 2890 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2891 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2720 2893
2721 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2722
2723} 2895}
2724 2896
2725############################################################################# 2897#############################################################################
2726 2898
2727package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2728 2900
2729use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2730 2902
2731our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2732 2904
2733sub moveto { 2905sub moveto {
2734 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2735 2907
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 2936 glPopMatrix;
2765} 2937}
2766 2938
2767############################################################################# 2939#############################################################################
2768 2940
2769package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2770 2942
2771our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2772 2944
2773sub new { 2945sub new {
2774 my $class = shift; 2946 my $class = shift;
2775 2947
2776 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2789} 2961}
2790 2962
2791############################################################################# 2963#############################################################################
2792 2964
2793package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2794 2966
2795our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2796 2968
2797use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2798 2970
2799sub new { 2971sub new {
2800 my $class = shift; 2972 my $class = shift;
2801 2973
2802 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2805 ) 2977 )
2806} 2978}
2807 2979
2808sub set_tooltip_from { 2980sub set_tooltip_from {
2809 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2810 2985
2811 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2812 2987
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 2993 }
2819 2994
2820 $tooltip =~ s/^\n+//; 2995 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 2996 $tooltip =~ s/\n+$//;
2822 2997
2823 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 2999 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3001 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2828 ellipsise => 0, 3003 ellipsise => 0,
… …
2851 3026
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2854 or return; 3029 or return;
2855 3030
3031 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3033
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3035 if $x + $self->{w} > $self->{root}{w};
2860 3036
2861 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2862 }); 3041 });
2863} 3042}
2864 3043
2865sub _draw { 3044sub _draw {
2866 my ($self) = @_; 3045 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2891} 3070}
2892 3071
2893############################################################################# 3072#############################################################################
2894 3073
2895package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2896 3075
2897our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2898 3077
2899use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2900 3079
2901sub new { 3080sub new {
2902 my $class = shift; 3081 my $class = shift;
2903 3082
2904 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2939sub _draw { 3118sub _draw {
2940 my ($self) = @_; 3119 my ($self) = @_;
2941 3120
2942 return unless $::CONN; 3121 return unless $::CONN;
2943 3122
3123 $self->SUPER::_draw;
3124
2944 my $face; 3125 my $face;
2945 3126
2946 if ($self->{frame}) { 3127 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2948 3129
… …
2970 $self->SUPER::destroy; 3151 $self->SUPER::destroy;
2971} 3152}
2972 3153
2973############################################################################# 3154#############################################################################
2974 3155
2975package CFClient::UI::Buttonbar; 3156package CFPlus::UI::Buttonbar;
2976 3157
2977our @ISA = CFClient::UI::HBox::; 3158our @ISA = CFPlus::UI::HBox::;
2978 3159
2979# TODO: should actualyl wrap buttons and other goodies. 3160# TODO: should actualyl wrap buttons and other goodies.
2980 3161
2981############################################################################# 3162#############################################################################
2982 3163
2983package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2984 3165
2985our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2986 3167
2987use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2988 3169
2989sub new { 3170sub new {
2990 my $class = shift; 3171 my $class = shift;
2991 3172
2992 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2993 items => [], 3174 items => [],
2994 z => 100, 3175 z => 100,
2995 @_, 3176 @_,
2996 ); 3177 );
2997 3178
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3180
3000 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
3002 3183
3003 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
3004 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
3005 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3190 can_hover => 1,
3007 can_events => 1, 3191 can_events => 1,
3192 tooltip => $tooltip,
3193 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ],
3197 ;
3198
3199 } else {
3200 $widget = new CFPlus::UI::Label
3201 can_hover => 1,
3202 can_events => 1,
3008 markup => $widget, 3203 markup => $widget,
3009 tooltip => $tooltip 3204 tooltip => $tooltip;
3205 }
3010 } 3206 }
3011 3207
3012 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
3013 3209
3014 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
3057 1 3253 1
3058} 3254}
3059 3255
3060############################################################################# 3256#############################################################################
3061 3257
3062package CFClient::UI::Multiplexer; 3258package CFPlus::UI::Multiplexer;
3063 3259
3064our @ISA = CFClient::UI::Container::; 3260our @ISA = CFPlus::UI::Container::;
3065 3261
3066sub new { 3262sub new {
3067 my $class = shift; 3263 my $class = shift;
3068 3264
3069 my $self = $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
… …
3083 3279
3084 $self->{current} = $self->{children}[0] 3280 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3281 if @{ $self->{children} };
3086} 3282}
3087 3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
3088sub set_current_page { 3290sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3291 my ($self, $page_or_widget) = @_;
3090 3292
3091 my $widget = ref $page_or_widget 3293 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3294 ? $page_or_widget
… …
3124 $self->{current}->draw; 3326 $self->{current}->draw;
3125} 3327}
3126 3328
3127############################################################################# 3329#############################################################################
3128 3330
3129package CFClient::UI::Notebook; 3331package CFPlus::UI::Notebook;
3130 3332
3131our @ISA = CFClient::UI::VBox::; 3333our @ISA = CFPlus::UI::VBox::;
3132 3334
3133sub new { 3335sub new {
3134 my $class = shift; 3336 my $class = shift;
3135 3337
3136 my $self = $class->SUPER::new ( 3338 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3339 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3341 # filter => # will be put between multiplexer and $self
3140 @_, 3342 @_,
3141 ); 3343 );
3142 3344
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3149sub add { 3351sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3352 my ($self, $title, $widget, $tooltip) = @_;
3151 3353
3152 Scalar::Util::weaken $self; 3354 Scalar::Util::weaken $self;
3153 3355
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3357 markup => $title,
3156 tooltip => $tooltip, 3358 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3359 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3360 );
3159 3361
3160 $self->{multiplexer}->add ($widget); 3362 $self->{multiplexer}->add ($widget);
3161} 3363}
3162 3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3163sub set_current_page { 3371sub set_current_page {
3164 my ($self, $page) = @_; 3372 my ($self, $page) = @_;
3165 3373
3166 $self->{multiplexer}->set_current_page ($page); 3374 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3375 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3376}
3169 3377
3170############################################################################# 3378#############################################################################
3171 3379
3172package CFClient::UI::Combobox; 3380package CFPlus::UI::Selector;
3173 3381
3174use utf8; 3382use utf8;
3175 3383
3176our @ISA = CFClient::UI::Button::; 3384our @ISA = CFPlus::UI::Button::;
3177 3385
3178sub new { 3386sub new {
3179 my $class = shift; 3387 my $class = shift;
3180 3388
3181 my $self = $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3406 my ($value, $title, $tooltip) = @$_;
3199 3407
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3409 }
3202 3410
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3412}
3205 3413
3206sub _set_value { 3414sub _set_value {
3207 my ($self, $value) = @_; 3415 my ($self, $value) = @_;
3208 3416
… …
3223 $self->emit (changed => $value); 3431 $self->emit (changed => $value);
3224} 3432}
3225 3433
3226############################################################################# 3434#############################################################################
3227 3435
3228package CFClient::UI::Statusbox; 3436package CFPlus::UI::Statusbox;
3229 3437
3230our @ISA = CFClient::UI::VBox::; 3438our @ISA = CFPlus::UI::VBox::;
3231 3439
3232sub new { 3440sub new {
3233 my $class = shift; 3441 my $class = shift;
3234 3442
3235 my $self = $class->SUPER::new ( 3443 my $self = $class->SUPER::new (
… …
3247sub reorder { 3455sub reorder {
3248 my ($self) = @_; 3456 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3457 my $NOW = Time::HiRes::time;
3250 3458
3251 # freeze display when hovering over any label 3459 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3460 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3462 values %{ $self->{item} };
3255 3463
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3466 }
… …
3279 for ($short) { 3487 for ($short) {
3280 s/^\s+//; 3488 s/^\s+//;
3281 s/\s+/ /g; 3489 s/\s+/ /g;
3282 } 3490 }
3283 3491
3284 new CFClient::UI::Label 3492 new CFPlus::UI::Label
3285 markup => $short, 3493 markup => $short,
3286 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3551 count => 1,
3344 %arg, 3552 %arg,
3345 }; 3553 };
3346 } 3554 }
3347 3555
3556 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3557 $self->reorder;
3558 });
3349} 3559}
3350 3560
3351sub reconfigure { 3561sub reconfigure {
3352 my ($self) = @_; 3562 my ($self) = @_;
3353 3563
… …
3366 $self->SUPER::destroy; 3576 $self->SUPER::destroy;
3367} 3577}
3368 3578
3369############################################################################# 3579#############################################################################
3370 3580
3371package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
3372 3582
3373our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
3374 3584
3375sub new { 3585sub new {
3376 my $class = shift; 3586 my $class = shift;
3377 3587
3378 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
3380 @_, 3591 @_,
3381 ); 3592 );
3382 3593
3594 $self->set_sort_order (undef);
3595
3383 $self 3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3384} 3632}
3385 3633
3386sub set_items { 3634sub set_items {
3387 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
3388 3636
3389 $self->{child}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
3390 return unless $items; 3638 $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} 3639}
3410 3640
3411############################################################################# 3641#############################################################################
3412 3642
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 commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList; 3643package CFPlus::UI::SpellList;
3612 3644
3613our @ISA = CFClient::UI::Table::; 3645our @ISA = CFPlus::UI::Table::;
3614 3646
3615sub new { 3647sub new {
3616 my $class = shift; 3648 my $class = shift;
3617 3649
3618 my $self = $class->SUPER::new ( 3650 my $self = $class->SUPER::new (
… …
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637 3669
3638sub rebuild_spell_list { 3670sub rebuild_spell_list {
3639 my ($self) = @_; 3671 my ($self) = @_;
3640 3672
3641 $CFClient::UI::ROOT->on_refresh ($self => sub { 3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear; 3674 $self->clear;
3643 3675
3644 return unless $::CONN; 3676 return unless $::CONN;
3645 3677
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651 3683
3652 my $row = 0; 3684 my $row = 0;
3653 3685
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_}; 3687 my $spell = $self->{spell}{$_};
… …
3662 if ($ev->{button} == 1) { 3694 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}"); 3695 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) { 3696 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3697 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3698 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3699 (new CFPlus::UI::Menu
3668 items => [ 3700 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ], 3703 ],
3672 )->popup ($ev); 3704 )->popup ($ev);
3673 } else { 3705 } else {
3674 return 0; 3706 return 0;
… …
3678 }; 3710 };
3679 3711
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681 3713
3682 #TODO: add path info to tooltip 3714 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3684 3716
3685 $self->add (0, $row, new CFClient::UI::Face 3717 $self->add (0, $row, new CFPlus::UI::Face
3686 face => $spell->{face}, 3718 face => $spell->{face},
3687 can_hover => 1, 3719 can_hover => 1,
3688 can_events => 1, 3720 can_events => 1,
3689 tooltip => $tooltip, 3721 tooltip => $tooltip,
3690 on_button_down => $spell_cb, 3722 on_button_down => $spell_cb,
3691 ); 3723 );
3692 3724
3693 $self->add (1, $row, new CFClient::UI::Label 3725 $self->add (1, $row, new CFPlus::UI::Label
3694 expand => 1, 3726 expand => 1,
3695 text => $spell->{name}, 3727 text => $spell->{name},
3696 can_hover => 1, 3728 can_hover => 1,
3697 can_events => 1, 3729 can_events => 1,
3698 tooltip => $tooltip, 3730 tooltip => $tooltip,
3699 on_button_down => $spell_cb, 3731 on_button_down => $spell_cb,
3700 ); 3732 );
3701 3733
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 } 3738 }
3707 }); 3739 });
3708} 3740}
3709 3741
3710sub add_spell { 3742sub add_spell {
… …
3728 $self->rebuild_spell_list; 3760 $self->rebuild_spell_list;
3729} 3761}
3730 3762
3731############################################################################# 3763#############################################################################
3732 3764
3733package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3734 3766
3735our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3736 3768
3737use List::Util qw(min max); 3769use List::Util qw(min max);
3738 3770
3739use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3740 3772
3741sub new { 3773sub new {
3742 my $class = shift; 3774 my $class = shift;
3743 3775
3744 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3953
3922 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3924 3956
3957 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h;
3959
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965
3925 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3927 3968
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 3970 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 3995 glLoadIdentity;
3955 3996
3956 { 3997 {
3957 package CFClient::UI::Base; 3998 package CFPlus::UI::Base;
3958 3999
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4001 (0, 0, $self->{w}, $self->{h});
3961 } 4002 }
3962 4003
3963 $self->_draw; 4004 $self->_draw;
3964} 4005}
3965 4006
3966############################################################################# 4007#############################################################################
3967 4008
3968package CFClient::UI; 4009package CFPlus::UI;
3969 4010
3970$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4013
39731 40141
3974 4015

Diff Legend

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