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

Diff Legend

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