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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
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;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $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; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $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}; 252 $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}; 253 $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}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552#sub find_widget {
486 my ($self, $x, $y) = @_; 553# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 554
497sub set_parent { 555sub set_parent {
498 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
499 557
500 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
502} 560}
503 561
504sub realloc { 562sub realloc {
505 my ($self) = @_; 563 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
574 glEnd; 632 glEnd;
575 glPopMatrix; 633 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 635 }
578 636
579 $self->_draw; 637 $self->_draw;
580 glPopMatrix; 638 glPopMatrix;
581} 639}
… …
584 my ($self) = @_; 642 my ($self) = @_;
585 643
586 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
587} 645}
588 646
647my $cntx;#d#
589sub DESTROY { 648sub DESTROY {
590 my ($self) = @_; 649 my ($self) = @_;
591 650
592 delete $WIDGET{$self+0}; 651 return if CFPlus::in_destruct;
593 652
594 eval { $self->destroy }; 653 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
596} 657}
597 658
598############################################################################# 659#############################################################################
599 660
600package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
601 662
602our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
603 664
604use strict; 665use strict;
605use CFClient::OpenGL; 666use CFPlus::OpenGL;
606 667
607sub new { 668sub new {
608 my $class = shift; 669 my $class = shift;
609 670
610 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
641 } 702 }
642} 703}
643 704
644############################################################################# 705#############################################################################
645 706
646package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
647 708
648our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
649 710
650sub new { 711sub new {
651 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
653} 714}
… …
660 721
661sub draw { } 722sub draw { }
662 723
663############################################################################# 724#############################################################################
664 725
665package CFClient::UI::Container; 726package CFPlus::UI::Container;
666 727
667our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
668 729
669sub new { 730sub new {
670 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
671 732
672 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
681 if $children; 742 if $children;
682 743
683 $self 744 $self
684} 745}
685 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
686sub add { 755sub add {
687 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
688 757
689 $_->set_parent ($self) 758 $_->set_parent ($self)
690 for @widgets; 759 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
751} 820}
752 821
753############################################################################# 822#############################################################################
754 823
755package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
756 825
757our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
758 827
759sub new { 828sub new {
760 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
761 830
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 832
764 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
765} 834}
766 835
767sub add { 836sub add {
… …
774sub remove { 843sub remove {
775 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
776 845
777 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
778 847
779 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 849 unless @{$self->{children}};
781} 850}
782 851
783sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
784 853
… …
796 865
797############################################################################# 866#############################################################################
798 867
799# back-buffered drawing area 868# back-buffered drawing area
800 869
801package CFClient::UI::Window; 870package CFPlus::UI::Window;
802 871
803our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
804 873
805use CFClient::OpenGL; 874use CFPlus::OpenGL;
806 875
807sub new { 876sub new {
808 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
809 878
810 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
832} 901}
833 902
834sub render_child { 903sub render_child {
835 my ($self) = @_; 904 my ($self) = @_;
836 905
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
840 909
841 { 910 {
842 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
843 912
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
846 } 917 }
847
848 $self->_render;
849 }; 918 };
850} 919}
851 920
852sub _draw { 921sub _draw {
853 my ($self) = @_; 922 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 923
857 my $tex = $self->{texture} 924 my $tex = $self->{texture}
858 or return; 925 or return;
859 926
860 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
863 930
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
865 932
866 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
867} 934}
868 935
869############################################################################# 936#############################################################################
870 937
871package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
872 939
940use List::Util qw(min max);
941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
908} 977}
909 978
910sub set_offset { 979sub set_offset {
911 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
912 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
915 988
989 $self->emit (changed => $x, $y);
916 $self->update; 990 $self->update;
991 }
917} 992}
918 993
919# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 995sub coord2local {
921 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
937 1012
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1015 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1017 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1019 }
945} 1020}
946 1021
947sub _render { 1022sub _render {
948 my ($self) = @_; 1023 my ($self) = @_;
949 1024
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1027
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1029
955 $self->SUPER::_render; 1030 $self->SUPER::_render;
956} 1031}
957 1032
958############################################################################# 1033#############################################################################
959 1034
960package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
961 1036
962our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
963 1038
964sub new { 1039sub new {
965 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
966 1041
967 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
968 1043
969 my $self; 1044 my $self;
970 1045
971 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1056 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1058 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1061 },
977 ; 1062 ;
978 1063
979 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
986 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
987 1092
988 $self 1093 $self
989} 1094}
1095
1096#TODO# update range on size_allocate depending on child
990 1097
991sub add { 1098sub add {
992 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
993 1100
994 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
995} 1102}
996 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
997sub update { 1128sub update {
998 my ($self) = @_; 1129 my ($self) = @_;
999 1130
1131 $self->update_slider;
1000 $self->SUPER::update; 1132 $self->SUPER::update;
1133}
1001 1134
1002 # todo: overwrite size_allocate of child 1135sub invoke_mouse_wheel {
1003 my $child = $self->{vp}->child; 1136 my ($self, $ev) = @_;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1005} 1186}
1006 1187
1007sub invoke_size_allocate { 1188sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1009 1190
1010 my $child = $self->{vp}->child; 1191 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1193}
1015 1194
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1195#############################################################################
1020 1196
1021package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1022 1198
1023our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1024 1200
1025use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1026 1202
1027sub new { 1203sub new {
1028 my $class = shift; 1204 my $class = shift;
1029 1205
1030 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1057} 1233}
1058 1234
1059############################################################################# 1235#############################################################################
1060 1236
1061package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1062 1238
1063our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1064 1240
1065use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1066 1342
1067my $bg = 1343my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1070 1346
1071my @border = 1347my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1074 1354
1075sub new { 1355sub new {
1076 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1077 1357
1078 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1361 border => 0.6,
1082 can_events => 1, 1362 can_events => 1,
1083 min_w => 16, 1363 min_w => 64,
1084 min_h => 16, 1364 min_h => 32,
1085 %arg, 1365 %arg,
1086 ); 1366 );
1087 1367
1088 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1369 align => 0,
1090 valign => 1, 1370 valign => 1,
1091 text => $self->{title}, 1371 text => $self->{title},
1092 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1093 if exists $self->{title}; 1373 if exists $self->{title};
1094 1374
1095 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1376 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1378 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1379 on_activate => sub { $self->emit ("delete") };
1100 1380
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1382 }
1103 1383
1104 $self 1384 $self
1105} 1385}
1106 1386
1107sub add { 1387sub add {
1108 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1109 1389
1110 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1393}
1114 1394
1115sub border { 1395sub border {
1116 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1117} 1397}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1430 $self->child->configure ($border, $border, $w, $h);
1151 1431
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1433 if $self->{close_button};
1154 1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1442
1155 1 1443 1
1156} 1444}
1157 1445
1158sub invoke_button_down { 1446sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1506
1219 ! ! $self->{motion} 1507 ! ! $self->{motion}
1220} 1508}
1221 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1222sub _draw { 1518sub _draw {
1223 my ($self) = @_; 1519 my ($self) = @_;
1224 1520
1225 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1226 1522
… …
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1528
1233 my $border = $self->border; 1529 my $border = $self->border;
1234 1530
1235 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240 1550
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1243 1553
1244 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1573 if $self->{close_button};
1264} 1574}
1265 1575
1266############################################################################# 1576#############################################################################
1267 1577
1268package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1269 1579
1270our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1271 1581
1272use List::Util qw(max sum); 1582use List::Util qw(max sum);
1273 1583
1274use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1275 1585
1276sub new { 1586sub new {
1277 my $class = shift; 1587 my $class = shift;
1278 1588
1279 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1280 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1281 @_, 1593 @_,
1282 ) 1594 )
1283} 1595}
1284 1596
1285sub children { 1597sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1599}
1288 1600
1601# TODO: store row/col info in child widget and use standard add/del
1289sub add { 1602sub add {
1290 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1291 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1292 $child->set_parent ($self); 1615 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1294 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1621 $self->realloc;
1296} 1622}
1297 1623
1298sub remove { 1624sub remove {
1299 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1300 1626
1301 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1302} 1632}
1303 1633
1304# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1305sub clear { 1635sub clear {
1306 my ($self) = @_; 1636 my ($self) = @_;
… …
1355 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1356 1686
1357 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1359 1689
1360 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1361 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1364 1694
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1696
1369 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1370 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1371 1706
1372 my $y; 1707 my $y;
1373 1708
1374 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1418 } 1753 }
1419} 1754}
1420 1755
1421############################################################################# 1756#############################################################################
1422 1757
1423package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1424 1759
1760use List::Util qw(min max);
1761
1425our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1426 1843
1427sub size_request { 1844sub size_request {
1428 my ($self) = @_; 1845 my ($self) = @_;
1429 1846
1430 $self->{vertical} 1847 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1881 for 0 .. $#children;
1465 } 1882 }
1466 } 1883 }
1467 1884
1468 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1469 1886
1470 my $pos = 0; 1887 my $pos = 0;
1471 for (0 .. $#children) { 1888 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1895 1
1479} 1896}
1480 1897
1481############################################################################# 1898#############################################################################
1482 1899
1483package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1484 1901
1485our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1486 1903
1487sub new { 1904sub new {
1488 my $class = shift; 1905 my $class = shift;
1489 1906
1490 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1493 ) 1910 )
1494} 1911}
1495 1912
1496############################################################################# 1913#############################################################################
1497 1914
1498package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1499 1916
1500our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1501 1918
1502sub new { 1919sub new {
1503 my $class = shift; 1920 my $class = shift;
1504 1921
1505 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1508 ) 1925 )
1509} 1926}
1510 1927
1511############################################################################# 1928#############################################################################
1512 1929
1513package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1514 1931
1515our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1516 1933
1517use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1518 1935
1519sub new { 1936sub new {
1520 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1521 1938
1522 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1942 #active_bg => none
1526 #font => default_font 1943 #font => default_font
1527 #text => initial text 1944 #text => initial text
1528 #markup => initial narkup 1945 #markup => initial narkup
1529 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1530 ellipsise => 3, # end 1948 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1950 fontsize => 1,
1533 align => -1, 1951 align => -1,
1534 valign => -1, 1952 valign => -1,
1535 padding_x => 2, 1953 padding_x => 2,
1536 padding_y => 2, 1954 padding_y => 2,
1537 can_events => 0, 1955 can_events => 0,
1538 %arg 1956 %arg
1539 ); 1957 );
1540 1958
1541 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1962 $self->{template} = $layout;
1545 } 1963 }
1546 1964
1547 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1551 } 1969 }
1552 1970
1553 $self 1971 $self
1554} 1972}
1555 1973
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1974sub update {
1567 my ($self) = @_; 1975 my ($self) = @_;
1568 1976
1569 delete $self->{texture}; 1977 delete $self->{texture};
1570 $self->SUPER::update; 1978 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1582 1990
1583 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1585 1993
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1588 1995
1589 delete $self->{size_req}; 1996 delete $self->{size_req};
1590 $self->realloc; 1997 $self->realloc;
1591 $self->update; 1998 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1599 2006
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 2008
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
1604 2010
1605 delete $self->{size_req}; 2011 delete $self->{size_req};
1606 $self->realloc; 2012 $self->realloc;
1607 $self->update; 2013 $self->update;
… …
1619 2025
1620 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1621 2027
1622 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 2029 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2032
1626 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1627 2034
1628 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
… …
1652 2059
1653sub set_fontsize { 2060sub set_fontsize {
1654 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1655 2062
1656 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1657 delete $self->{texture}; 2065 delete $self->{texture};
1658 2066
1659 $self->realloc; 2067 $self->realloc;
1660} 2068}
1661 2069
1662sub reconfigure { 2070sub reconfigure {
1663 my ($self) = @_; 2071 my ($self) = @_;
1664 2072
1665 delete $self->{size_req}; 2073 delete $self->{size_req};
2074 delete $self->{texture};
1666 2075
1667 $self->SUPER::reconfigure; 2076 $self->SUPER::reconfigure;
1668} 2077}
1669 2078
1670sub _draw { 2079sub _draw {
1671 my ($self) = @_; 2080 my ($self) = @_;
1672 2081
1673 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1674 2083
1675 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2091
1683 new_from_layout CFClient::Texture $self->{layout} 2092 [$self->{layout}->size]
1684 }; 2093 };
1685 2094
1686 unless (exists $self->{ox}) { 2095 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1690 2099
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 2103 };
1695 2104
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 2107
1701 if ($tex->{format} == GL_ALPHA) { 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 2109}
1712 2110
1713############################################################################# 2111#############################################################################
1714 2112
1715package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1716 2114
1717our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1718 2116
1719use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1720 2118
1721sub new { 2119sub new {
1722 my $class = shift; 2120 my $class = shift;
1723 2121
1724 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1729 can_hover => 1, 2127 can_hover => 1,
1730 can_focus => 1, 2128 can_focus => 1,
1731 valign => 0, 2129 valign => 0,
1732 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1733 #text => ... 2132 #text => ...
1734 #hidden => "*", 2133 #hidden => "*",
1735 @_ 2134 @_
1736 ) 2135 )
1737} 2136}
… …
1782 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1784 2183
1785 my $text = $self->get_text; 2184 my $text = $self->get_text;
1786 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1787 if ($uni == 8) { 2188 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1796 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2212 $self->emit ('escape');
1801 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2217 } else {
1804 return 0; 2218 return 0;
1805 } 2219 }
1806 2220
1807 $self->_set_text ($text); 2221 $self->_set_text ($text);
1808 2222
1809 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1810 2225
1811 1 2226 1
1812} 2227}
1813 2228
1814sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1826 2241
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2243
1829 # byte-index to char-index 2244 # byte-index to char-index
1830 my $text = $self->{text}; 2245 my $text = $self->{text};
1831 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1833 2248
1834 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1835 $self->update; 2250 $self->update;
1836 2251
1837 1 2252 1
… …
1876 utf8::encode $text; 2291 utf8::encode $text;
1877 2292
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2294 }
1880 2295
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2296 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2299 glEnd;
1886 } 2300 }
1887} 2301}
1888 2302
2303#############################################################################
2304
1889package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1890 2306
1891our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1892 2308
1893use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1894 2310
1895sub invoke_key_down { 2311sub invoke_key_down {
1896 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1897 2313
1898 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1899 2315
1900 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1903 2319
1904 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1907 $self->update; 2323 $self->update;
1908 2324
1909 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1912 } 2328 }
1913 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2333 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2335 }
1920 2336
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2340
1925 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2351 1
1936} 2352}
1937 2353
1938############################################################################# 2354#############################################################################
1939 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1940package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1941 2396
1942our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1943 2398
1944use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1945 2400
1946my @tex = 2401my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1949 2404
1950sub new { 2405sub new {
1951 my $class = shift; 2406 my $class = shift;
1952 2407
1953 $class->SUPER::new ( 2408 $class->SUPER::new (
1954 padding_x => 4, 2409 padding_x => 4,
1955 padding_y => 4, 2410 padding_y => 4,
1956 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1957 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1958 can_hover => 1, 2413 can_hover => 1,
1959 align => 0, 2414 align => 0,
1960 valign => 0, 2415 valign => 0,
1961 can_events => 1, 2416 can_events => 1,
1962 @_ 2417 @_
… …
1980 2435
1981 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1984 2439
2440 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2442
1987 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1988 2444
1989 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1990} 2446}
1991 2447
1992############################################################################# 2448#############################################################################
1993 2449
2450package CFPlus::UI::CheckBox;
2451
2452our @ISA = CFPlus::UI::DrawBG::;
2453
2454my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457
2458use CFPlus::OpenGL;
2459
2460sub new {
2461 my $class = shift;
2462
2463 $class->SUPER::new (
2464 padding_x => 2,
2465 padding_y => 2,
2466 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2],
2469 active_bg => [1, 1, 1, 0.5],
2470 state => 0,
2471 can_hover => 1,
2472 @_
2473 )
2474}
2475
2476sub size_request {
2477 my ($self) = @_;
2478
2479 (6) x 2
2480}
2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
2490sub invoke_button_down {
2491 my ($self, $ev, $x, $y) = @_;
2492
2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2495 $self->toggle;
2496 } else {
2497 return 0
2498 }
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 $self->SUPER::_draw;
2507
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2509
2510 my ($w, $h) = @$self{qw(w h)};
2511
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513
2514 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2515
2516 my $tex = $self->{state} ? $tex[1] : $tex[0];
2517
2518 glEnable GL_TEXTURE_2D;
2519 $tex->draw_quad_alpha (0, 0, $s, $s);
2520 glDisable GL_TEXTURE_2D;
2521}
2522
2523#############################################################################
2524
2525package CFPlus::UI::Image;
2526
2527our @ISA = CFPlus::UI::Base::;
2528
2529use CFPlus::OpenGL;
2530
2531our %texture_cache;
2532
2533sub new {
2534 my $class = shift;
2535
2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2540
2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2543
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2546
2547 CFPlus::weaken $texture_cache{$self->{path}};
2548
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550
2551 $self
2552}
2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571
2572 ($self->{tex}{w}, $self->{tex}{h})
2573}
2574
2575sub _draw {
2576 my ($self) = @_;
2577
2578 my $tex = $self->{tex};
2579
2580 my ($w, $h) = ($self->{w}, $self->{h});
2581
2582 if ($self->{rot90}) {
2583 glRotate 90, 0, 0, 1;
2584 glTranslate 0, -$self->{w}, 0;
2585
2586 ($w, $h) = ($h, $w);
2587 }
2588
2589 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591
2592 $tex->draw_quad (0, 0, $w, $h);
2593
2594 glDisable GL_TEXTURE_2D;
2595}
2596
2597#############################################################################
2598
1994package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
1995 2600
1996our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
1997 2602
1998use CFClient::OpenGL; 2603use CFPlus::OpenGL;
1999 2604
2000my %textures; 2605my %textures;
2001 2606
2002sub new { 2607sub new {
2003 my $class = shift; 2608 my $class = shift;
… …
2025 1 2630 1
2026} 2631}
2027 2632
2028############################################################################# 2633#############################################################################
2029 2634
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2635package CFPlus::UI::VGauge;
2099 2636
2100our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2638
2161use List::Util qw(min max); 2639use List::Util qw(min max);
2162 2640
2163use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2164 2642
2165my %tex = ( 2643my %tex = (
2166 food => [ 2644 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2647 ],
2170 grace => [ 2648 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2651 ],
2174 hp => [ 2652 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2655 ],
2178 mana => [ 2656 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2659 ],
2182); 2660);
2183 2661
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2724
2247 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2726 my $h2 = $self->{h} * (1 - $ycut2);
2727 my $h3 = $self->{h};
2728
2729 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2730
2250 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
… …
2272 2753
2273 if ($t3) { 2754 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2761 glEnd;
2281 } 2762 }
2282 2763
2283 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2285} 2766}
2286 2767
2287############################################################################# 2768#############################################################################
2288 2769
2289package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2290 2771
2291our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2292 2773
2293sub new { 2774sub new {
2294 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2295 2776
2296 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2779 can_hover => 1,
2299 can_events => 1, 2780 can_events => 1,
2300 %arg, 2781 %arg,
2301 ); 2782 );
2302 2783
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2787
2307 $self 2788 $self
2308} 2789}
2309 2790
2310sub set_fontsize { 2791sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2332} 2813}
2333 2814
2334############################################################################# 2815#############################################################################
2335 2816
2336package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2337 2818
2338use strict; 2819use strict;
2339 2820
2340use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2341 2822
2342our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2343 2824
2344my @tex = 2825my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2347 2828
2348sub new { 2829sub new {
2349 my $class = shift; 2830 my $class = shift;
2350 2831
… …
2439 } 2920 }
2440 2921
2441 1 2922 1
2442} 2923}
2443 2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2935}
2936
2444sub update { 2937sub update {
2445 my ($self) = @_; 2938 my ($self) = @_;
2446 2939
2447 delete $self->{knob_w}; 2940 delete $self->{knob_w};
2448 $self->SUPER::update; 2941 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2496} 2989}
2497 2990
2498############################################################################# 2991#############################################################################
2499 2992
2500package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2501 2994
2502our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2503 2996
2504sub new { 2997sub new {
2505 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2506 2999
2507 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2508 3001
2509 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 3005 to_value => sub { shift },
2513 from_value => sub { shift }, 3006 from_value => sub { shift },
2514 %arg, 3007 %arg,
2515 ); 3008 );
2516 3009
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2538 3031
2539############################################################################# 3032#############################################################################
2540 3033
2541package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2542 3035
2543our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2544 3037
2545use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2546 3039
2547sub new { 3040sub new {
2548 my $class = shift; 3041 my $class = shift;
2549 3042
2550 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2551 fontsize => 1, 3044 fontsize => 1,
2552 can_events => 0, 3045 can_events => 1,
2553 indent => 0, 3046 indent => 0,
2554 #font => default_font 3047 #font => default_font
2555 @_, 3048 @_,
2556 3049
2557 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2558 par => [], 3051 par => [],
3052 max_par => 0,
2559 height => 0, 3053 height => 0,
2560 children => [ 3054 children => [
2561 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2563 ], 3057 ],
2564 ); 3058 );
2565 3059
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3061
… …
2597 3091
2598 $self->reflow; 3092 $self->reflow;
2599 3093
2600 local $self->{children} = [$empty, $slider]; 3094 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
2602} 3106}
2603 3107
2604sub get_layout { 3108sub get_layout {
2605 my ($self, $para) = @_; 3109 my ($self, $para) = @_;
2606 3110
… …
2634 3138
2635 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2637} 3141}
2638 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2639sub clear { 3158sub clear {
2640 my ($self) = @_; 3159 my ($self) = @_;
2641 3160
2642 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3165 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3167}
2649 3168
2650sub add_paragraph { 3169sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2652 3171
2653 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2654
2655 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3179 w => 1e10,
2657 wrapped => 1, 3180 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3181 };
2663 3182
2664 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
2666 3190
2667 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2668 $self->update; 3192 $self->update;
2669} 3193}
2670 3194
2671sub scroll_to_bottom { 3195sub scroll_to_bottom {
2672 my ($self) = @_; 3196 my ($self) = @_;
2673 3197
2674 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3199 $self->update;
2676} 3200}
2677 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2678sub update { 3235sub update {
2679 my ($self) = @_; 3236 my ($self) = @_;
2680 3237
2681 $self->SUPER::update; 3238 $self->SUPER::update;
2682 3239
2683 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2684 3241
2685 delete $self->{texture}; 3242 delete $self->{texture};
2686 3243
2687 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3248
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2720 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2722 3262
2723 my $y0 = $top; 3263 my $y0 = $top;
2724 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2725 3265
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2734 3269
2735 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2738 3272
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3273 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3274
2744 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3276 my @s = $layout->get_shapes;
2746 3277
2747 glDisable GL_BLEND;
2748 for (@w) { 3278 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 3279 my ($dx, $dy) = splice @s, 0, 2, ();
2750 3280
2751 $_->{x} = $dx + $para->{indent}; 3281 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 3282 $_->{y} = $dy + $y - $y0;
2753 3283
2754 $_->draw; 3284 $_->draw;
2755 } 3285 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 3286 }
2759 } 3287 }
2760 3288
2761 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3291 }
2763 3292
2764 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2765 }; 3294 };
2766 }); 3295 });
2767} 3296}
2768 3297
2769sub reconfigure { 3298sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2788} 3317}
2789 3318
2790############################################################################# 3319#############################################################################
2791 3320
2792package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2793 3322
2794use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2795 3324
2796our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2797 3326
2798sub moveto { 3327sub moveto {
2799 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2800 3329
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3358 glPopMatrix;
2830} 3359}
2831 3360
2832############################################################################# 3361#############################################################################
2833 3362
2834package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2835 3364
2836our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2837 3366
2838sub new { 3367sub new {
2839 my $class = shift; 3368 my $class = shift;
2840 3369
2841 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2854} 3383}
2855 3384
2856############################################################################# 3385#############################################################################
2857 3386
2858package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2859 3388
2860our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2861 3390
2862use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2863 3392
2864sub new { 3393sub new {
2865 my $class = shift; 3394 my $class = shift;
2866 3395
2867 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2870 ) 3399 )
2871} 3400}
2872 3401
2873sub set_tooltip_from { 3402sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3407
2876 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2877 3409
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3415 }
2884 3416
2885 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2887 3419
2888 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3421 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3423 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3425 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3427 );
2896} 3428}
2897 3429
… …
2916 3448
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2919 or return; 3451 or return;
2920 3452
3453 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3455
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3457 if $x + $self->{w} > $self->{root}{w};
2925 3458
2926 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2927 }); 3463 });
2928} 3464}
2929 3465
2930sub _draw { 3466sub _draw {
2931 my ($self) = @_; 3467 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2956} 3492}
2957 3493
2958############################################################################# 3494#############################################################################
2959 3495
2960package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2961 3497
2962our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2963 3499
2964use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2965 3501
2966sub new { 3502sub new {
2967 my $class = shift; 3503 my $class = shift;
2968 3504
2969 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2970 aspect => 1, 3508 aspect => 1,
2971 can_events => 0, 3509 can_events => 0,
2972 @_, 3510 @_,
2973 ); 3511 );
2974 3512
2975 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2977 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3519 parked => 1,
2981 interval => $self->{animspeed},
2982 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2983 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2984 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2985 }, 3528 },
2986 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2987 } 3533 }
2988 3534
2989 $self 3535 $self
2990} 3536}
2991 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2992sub size_request { 3568sub size_request {
2993 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2994} 3584}
2995 3585
2996sub update { 3586sub update {
2997 my ($self) = @_; 3587 my ($self) = @_;
2998 3588
2999 return unless $self->{visible}; 3589 return unless $self->{visible};
3000 3590
3001 $self->SUPER::update; 3591 $self->SUPER::update;
3002} 3592}
3003 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3004sub _draw { 3602sub _draw {
3005 my ($self) = @_; 3603 my ($self) = @_;
3006 3604
3007 return unless $::CONN; 3605 return unless $::CONN;
3008 3606
3009 my $face; 3607 $self->SUPER::_draw;
3010 3608
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3610 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3611
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3019 3613
3020 if ($tex) { 3614 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3027} 3621}
3028 3622
3029sub destroy { 3623sub destroy {
3030 my ($self) = @_; 3624 my ($self) = @_;
3031 3625
3032 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3033 if $self->{timer}; 3627 if $self->{timer};
3034 3628
3035 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3036} 3630}
3037 3631
3038############################################################################# 3632#############################################################################
3039 3633
3040package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3041 3635
3042our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3043 3637
3044# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3045 3639
3046############################################################################# 3640#############################################################################
3047 3641
3048package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3049 3643
3050our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3051 3645
3052use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3053 3647
3054sub new { 3648sub new {
3055 my $class = shift; 3649 my $class = shift;
3056 3650
3057 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3058 items => [], 3652 items => [],
3059 z => 100, 3653 z => 100,
3060 @_, 3654 @_,
3061 ); 3655 );
3062 3656
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3658
3065 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3067 3661
3068 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3069 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
3070 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
3071 can_hover => 1, 3668 can_hover => 1,
3072 can_events => 1, 3669 can_events => 1,
3670 tooltip => $tooltip,
3671 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1),
3674 ],
3675 ;
3676
3677 } else {
3678 $widget = new CFPlus::UI::Label
3679 can_hover => 1,
3680 can_events => 1,
3073 markup => $widget, 3681 markup => $widget,
3074 tooltip => $tooltip 3682 tooltip => $tooltip;
3683 }
3075 } 3684 }
3076 3685
3077 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
3078 3687
3079 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
3122 1 3731 1
3123} 3732}
3124 3733
3125############################################################################# 3734#############################################################################
3126 3735
3127package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3128 3737
3129our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3130 3739
3131sub new { 3740sub new {
3132 my $class = shift; 3741 my $class = shift;
3133 3742
3134 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3148 3757
3149 $self->{current} = $self->{children}[0] 3758 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3759 if @{ $self->{children} };
3151} 3760}
3152 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
3153sub set_current_page { 3768sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3769 my ($self, $page_or_widget) = @_;
3155 3770
3156 my $widget = ref $page_or_widget 3771 my $widget = ref $page_or_widget
3157 ? $page_or_widget 3772 ? $page_or_widget
… …
3189 $self->{current}->draw; 3804 $self->{current}->draw;
3190} 3805}
3191 3806
3192############################################################################# 3807#############################################################################
3193 3808
3194package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3195 3810
3196our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3197 3812
3198sub new { 3813sub new {
3199 my $class = shift; 3814 my $class = shift;
3200 3815
3201 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3202 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3203 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3205 @_, 3820 @_,
3206 ); 3821 );
3207 3822
3208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3212} 3827}
3213 3828
3214sub add { 3829sub add {
3215 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3216 3831
3217 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3218 3833
3219 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3220 markup => $title, 3835 markup => $title,
3221 tooltip => $tooltip, 3836 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3838 );
3224 3839
3225 $self->{multiplexer}->add ($widget); 3840 $self->{multiplexer}->add ($widget);
3226} 3841}
3227 3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3228sub set_current_page { 3849sub set_current_page {
3229 my ($self, $page) = @_; 3850 my ($self, $page) = @_;
3230 3851
3231 $self->{multiplexer}->set_current_page ($page); 3852 $self->{multiplexer}->set_current_page ($page);
3232 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3233} 3854}
3234 3855
3235############################################################################# 3856#############################################################################
3236 3857
3237package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3238 3859
3239use utf8; 3860use utf8;
3240 3861
3241our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3242 3863
3243sub new { 3864sub new {
3244 my $class = shift; 3865 my $class = shift;
3245 3866
3246 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3263 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3264 3885
3265 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266 } 3887 }
3267 3888
3268 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269} 3890}
3270 3891
3271sub _set_value { 3892sub _set_value {
3272 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3273 3894
… …
3288 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3289} 3910}
3290 3911
3291############################################################################# 3912#############################################################################
3292 3913
3293package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3294 3915
3295our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3296 3917
3297sub new { 3918sub new {
3298 my $class = shift; 3919 my $class = shift;
3299 3920
3300 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3301 fontsize => 0.8, 3922 fontsize => 0.8,
3302 @_, 3923 @_,
3303 ); 3924 );
3304 3925
3305 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3306 3927
3307 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308 3929
3309 $self 3930 $self
3310} 3931}
… …
3312sub reorder { 3933sub reorder {
3313 my ($self) = @_; 3934 my ($self) = @_;
3314 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3315 3936
3316 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3317 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3318 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3320 3941
3321 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3322 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323 } 3944 }
… …
3344 for ($short) { 3965 for ($short) {
3345 s/^\s+//; 3966 s/^\s+//;
3346 s/\s+/ /g; 3967 s/\s+/ /g;
3347 } 3968 }
3348 3969
3349 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3350 markup => $short, 3971 markup => $short,
3351 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3352 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3353 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3354 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3408 count => 1, 4029 count => 1,
3409 %arg, 4030 %arg,
3410 }; 4031 };
3411 } 4032 }
3412 4033
4034 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 4035 $self->reorder;
4036 });
3414} 4037}
3415 4038
3416sub reconfigure { 4039sub reconfigure {
3417 my ($self) = @_; 4040 my ($self) = @_;
3418 4041
… …
3431 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3432} 4055}
3433 4056
3434############################################################################# 4057#############################################################################
3435 4058
3436package CFClient::UI::Inventory;
3437
3438our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445 @_,
3446 );
3447
3448 $self
3449}
3450
3451sub set_items {
3452 my ($self, $items) = @_;
3453
3454 $self->{child}->clear;
3455 return unless $items;
3456
3457 my @items = sort {
3458 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name})
3460 } @$items;
3461
3462 $self->{real_items} = \@items;
3463
3464 my $row = 0;
3465 for my $item (@items) {
3466 CFClient::Item::update_widgets $item;
3467
3468 $self->{child}->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget});
3471
3472 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 }
3682}
3683
3684#############################################################################
3685
3686package CFClient::UI::SpellList;
3687
3688our @ISA = CFClient::UI::Table::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 binding => [],
3695 commands => [],
3696 @_,
3697 )
3698}
3699
3700my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713sub rebuild_spell_list {
3714 my ($self) = @_;
3715
3716 $CFClient::UI::ROOT->on_refresh ($self => sub {
3717 $self->clear;
3718
3719 return unless $::CONN;
3720
3721 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727 my $row = 0;
3728
3729 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730 my $spell = $self->{spell}{$_};
3731
3732 $row++;
3733
3734 my $spell_cb = sub {
3735 my ($widget, $ev) = @_;
3736
3737 if ($ev->{button} == 1) {
3738 $::CONN->user_send ("cast $spell->{name}");
3739 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu
3743 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ],
3747 )->popup ($ev);
3748 } else {
3749 return 0;
3750 }
3751
3752 1
3753 };
3754
3755 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757 #TODO: add path info to tooltip
3758 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760 $self->add (0, $row, new CFClient::UI::Face
3761 face => $spell->{face},
3762 can_hover => 1,
3763 can_events => 1,
3764 tooltip => $tooltip,
3765 on_button_down => $spell_cb,
3766 );
3767
3768 $self->add (1, $row, new CFClient::UI::Label
3769 expand => 1,
3770 text => $spell->{name},
3771 can_hover => 1,
3772 can_events => 1,
3773 tooltip => $tooltip,
3774 on_button_down => $spell_cb,
3775 );
3776
3777 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781 }
3782 });
3783}
3784
3785sub add_spell {
3786 my ($self, $spell) = @_;
3787
3788 $self->{spell}->{$spell->{name}} = $spell;
3789 $self->rebuild_spell_list;
3790}
3791
3792sub remove_spell {
3793 my ($self, $spell) = @_;
3794
3795 delete $self->{spell}->{$spell->{name}};
3796 $self->rebuild_spell_list;
3797}
3798
3799sub clear_spells {
3800 my ($self) = @_;
3801
3802 $self->{spell} = {};
3803 $self->rebuild_spell_list;
3804}
3805
3806#############################################################################
3807
3808package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3809 4060
3810our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3811 4062
3812use List::Util qw(min max); 4063use List::Util qw(min max);
3813 4064
3814use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3815 4066
3816sub new { 4067sub new {
3817 my $class = shift; 4068 my $class = shift;
3818 4069
3819 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3820 visible => 1, 4071 visible => 1,
3821 @_, 4072 @_,
3822 ); 4073 );
3823 4074
3824 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3825 4076
3826 $self 4077 $self
3827} 4078}
3828 4079
3829sub size_request { 4080sub size_request {
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 4247
3997 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3999 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
4000 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
4002 4262
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
4014 4274
4015 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
4016 $_->() 4276 $_->()
4017 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
4018 } 4278 }
4019
4020 4279
4021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4023 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
4024 4283
… …
4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
4029 glLoadIdentity; 4288 glLoadIdentity;
4030 4289
4031 { 4290 {
4032 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
4033 4292
4034 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
4036 }
4037 4295
4038 $self->_draw; 4296 $self->_draw;
4297 }
4039} 4298}
4040 4299
4041############################################################################# 4300#############################################################################
4042 4301
4043package CFClient::UI; 4302package CFPlus::UI;
4044 4303
4045$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
4046$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047 4306
40481 43071
4049 4308

Diff Legend

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