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

Diff Legend

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