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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
593 661
594 eval { $self->destroy }; 662 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
… …
774sub remove { 852sub remove {
775 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
776 854
777 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
778 856
779 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 858 unless @{$self->{children}};
781} 859}
782 860
783sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
784 862
… …
796 874
797############################################################################# 875#############################################################################
798 876
799# back-buffered drawing area 877# back-buffered drawing area
800 878
801package CFClient::UI::Window; 879package CFPlus::UI::Window;
802 880
803our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
804 882
805use CFClient::OpenGL; 883use CFPlus::OpenGL;
806 884
807sub new { 885sub new {
808 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
809 887
810 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 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}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
981 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
982 %arg, 1073 %arg,
983 ); 1074 );
984 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
986 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
987 1087
988 $self 1088 $self
989} 1089}
990 1090
… …
994 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
995 1095
996 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
997} 1097}
998 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
999sub update_slider { 1109sub update_slider {
1000 my ($self) = @_; 1110 my ($self) = @_;
1001 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1003} 1121}
1004 1122
1005sub update { 1123sub update {
1006 my ($self) = @_; 1124 my ($self) = @_;
1007 1125
1008 $self->SUPER::update; 1126 $self->SUPER::update;
1009
1010 $self->update_slider; 1127 $self->update_slider;
1011} 1128}
1012 1129
1013sub invoke_size_allocate { 1130sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1015 1132
1016 $self->update_slider; 1133 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1135}
1020 1136
1021############################################################################# 1137#############################################################################
1022 1138
1023package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1024 1140
1025our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1026 1142
1027use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1028 1144
1029sub new { 1145sub new {
1030 my $class = shift; 1146 my $class = shift;
1031 1147
1032 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1059} 1175}
1060 1176
1061############################################################################# 1177#############################################################################
1062 1178
1063package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1064 1180
1065our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1066 1182
1067use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1068 1284
1069my $bg = 1285my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1072 1288
1073my @border = 1289my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1292
1077sub new { 1293sub new {
1078 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1079 1295
1080 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1299 border => 0.6,
1084 can_events => 1, 1300 can_events => 1,
1085 min_w => 16, 1301 min_w => 64,
1086 min_h => 16, 1302 min_h => 32,
1087 %arg, 1303 %arg,
1088 ); 1304 );
1089 1305
1090 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1307 align => 0,
1092 valign => 1, 1308 valign => 1,
1093 text => $self->{title}, 1309 text => $self->{title},
1094 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1095 if exists $self->{title}; 1311 if exists $self->{title};
1096 1312
1097 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1314 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1316 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1317 on_activate => sub { $self->emit ("delete") };
1102 1318
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1320 }
1105 1321
1106 $self 1322 $self
1107} 1323}
1108 1324
1109sub add { 1325sub add {
1110 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1111 1327
1112 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1331}
1116 1332
1117sub border { 1333sub border {
1118 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1119} 1335}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1368 $self->child->configure ($border, $border, $w, $h);
1153 1369
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1371 if $self->{close_button};
1156 1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1157 1 1381 1
1158} 1382}
1159 1383
1160sub invoke_button_down { 1384sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1444
1221 ! ! $self->{motion} 1445 ! ! $self->{motion}
1222} 1446}
1223 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1224sub _draw { 1456sub _draw {
1225 my ($self) = @_; 1457 my ($self) = @_;
1226 1458
1227 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1228 1460
… …
1265 if $self->{close_button}; 1497 if $self->{close_button};
1266} 1498}
1267 1499
1268############################################################################# 1500#############################################################################
1269 1501
1270package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1271 1503
1272our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1273 1505
1274use List::Util qw(max sum); 1506use List::Util qw(max sum);
1275 1507
1276use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1277 1509
1278sub new { 1510sub new {
1279 my $class = shift; 1511 my $class = shift;
1280 1512
1281 $class->SUPER::new ( 1513 $class->SUPER::new (
1282 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1283 @_, 1516 @_,
1284 ) 1517 )
1285} 1518}
1286 1519
1287sub children { 1520sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1522}
1290 1523
1291sub add { 1524sub add {
1292 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1293 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1529 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1296 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1535 $self->realloc;
1298} 1536}
1299 1537
1300sub remove { 1538sub remove {
1301 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1358 1596
1359 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1361 1599
1362 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1366 1604
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1606
1371 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1372 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1373 1616
1374 my $y; 1617 my $y;
1375 1618
1376 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1420 } 1663 }
1421} 1664}
1422 1665
1423############################################################################# 1666#############################################################################
1424 1667
1425package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1426 1669
1427our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1428 1671
1429sub size_request { 1672sub size_request {
1430 my ($self) = @_; 1673 my ($self) = @_;
1431 1674
1432 $self->{vertical} 1675 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1709 for 0 .. $#children;
1467 } 1710 }
1468 } 1711 }
1469 1712
1470 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1471 1714
1472 my $pos = 0; 1715 my $pos = 0;
1473 for (0 .. $#children) { 1716 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1723 1
1481} 1724}
1482 1725
1483############################################################################# 1726#############################################################################
1484 1727
1485package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1486 1729
1487our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1488 1731
1489sub new { 1732sub new {
1490 my $class = shift; 1733 my $class = shift;
1491 1734
1492 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1495 ) 1738 )
1496} 1739}
1497 1740
1498############################################################################# 1741#############################################################################
1499 1742
1500package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1501 1744
1502our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1503 1746
1504sub new { 1747sub new {
1505 my $class = shift; 1748 my $class = shift;
1506 1749
1507 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1510 ) 1753 )
1511} 1754}
1512 1755
1513############################################################################# 1756#############################################################################
1514 1757
1515package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1516 1759
1517our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1518 1761
1519use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1520 1763
1521sub new { 1764sub new {
1522 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1523 1766
1524 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1770 #active_bg => none
1528 #font => default_font 1771 #font => default_font
1529 #text => initial text 1772 #text => initial text
1530 #markup => initial narkup 1773 #markup => initial narkup
1531 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1532 ellipsise => 3, # end 1776 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1778 fontsize => 1,
1535 align => -1, 1779 align => -1,
1536 valign => -1, 1780 valign => -1,
1537 padding_x => 2, 1781 padding_x => 2,
1538 padding_y => 2, 1782 padding_y => 2,
1539 can_events => 0, 1783 can_events => 0,
1540 %arg 1784 %arg
1541 ); 1785 );
1542 1786
1543 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1790 $self->{template} = $layout;
1547 } 1791 }
1548 1792
1549 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1553 } 1797 }
1554 1798
1555 $self 1799 $self
1556} 1800}
1557 1801
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1802sub update {
1569 my ($self) = @_; 1803 my ($self) = @_;
1570 1804
1571 delete $self->{texture}; 1805 delete $self->{texture};
1572 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1584 1818
1585 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1587 1821
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1590 1823
1591 delete $self->{size_req}; 1824 delete $self->{size_req};
1592 $self->realloc; 1825 $self->realloc;
1593 $self->update; 1826 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1601 1834
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1836
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1606 1838
1607 delete $self->{size_req}; 1839 delete $self->{size_req};
1608 $self->realloc; 1840 $self->realloc;
1609 $self->update; 1841 $self->update;
… …
1621 1853
1622 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1623 1855
1624 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1860
1628 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1629 1862
1630 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1664 1897
1665sub reconfigure { 1898sub reconfigure {
1666 my ($self) = @_; 1899 my ($self) = @_;
1667 1900
1668 delete $self->{size_req}; 1901 delete $self->{size_req};
1902 delete $self->{texture};
1669 1903
1670 $self->SUPER::reconfigure; 1904 $self->SUPER::reconfigure;
1671} 1905}
1672 1906
1673sub _draw { 1907sub _draw {
1674 my ($self) = @_; 1908 my ($self) = @_;
1675 1909
1676 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1677 1911
1678 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1919
1686 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1687 }; 1921 };
1688 1922
1689 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1693 1927
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1931 };
1698 1932
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1935
1704 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1937}
1715 1938
1716############################################################################# 1939#############################################################################
1717 1940
1718package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1719 1942
1720our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1721 1944
1722use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1723 1946
1724sub new { 1947sub new {
1725 my $class = shift; 1948 my $class = shift;
1726 1949
1727 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1731 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1732 can_hover => 1, 1955 can_hover => 1,
1733 can_focus => 1, 1956 can_focus => 1,
1734 valign => 0, 1957 valign => 0,
1735 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1736 #text => ... 1960 #text => ...
1737 #hidden => "*", 1961 #hidden => "*",
1738 @_ 1962 @_
1739 ) 1963 )
1740} 1964}
… …
1785 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1787 2011
1788 my $text = $self->get_text; 2012 my $text = $self->get_text;
1789 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1790 if ($uni == 8) { 2016 if ($uni == 8) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1793 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1799 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2040 $self->emit ('escape');
1804 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2045 } else {
1807 return 0; 2046 return 0;
1808 } 2047 }
1809 2048
1810 $self->_set_text ($text); 2049 $self->_set_text ($text);
1811 2050
1812 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1813 2053
1814 1 2054 1
1815} 2055}
1816 2056
1817sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1829 2069
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2071
1832 # byte-index to char-index 2072 # byte-index to char-index
1833 my $text = $self->{text}; 2073 my $text = $self->{text};
1834 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1836 2076
1837 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1838 $self->update; 2078 $self->update;
1839 2079
1840 1 2080 1
… …
1879 utf8::encode $text; 2119 utf8::encode $text;
1880 2120
1881 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882 } 2122 }
1883 2123
1884 glColor @{$self->{fg}};
1885 glBegin GL_LINES; 2124 glBegin GL_LINES;
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888 glEnd; 2127 glEnd;
1889 } 2128 }
1890} 2129}
1891 2130
2131#############################################################################
2132
1892package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1893 2134
1894our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1895 2136
1896use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1897 2138
1898sub invoke_key_down { 2139sub invoke_key_down {
1899 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1900 2141
1901 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1902 2143
1903 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1906 2147
1907 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1910 $self->update; 2151 $self->update;
1911 2152
1912 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1915 } 2156 }
1916 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2161 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2163 }
1923 2164
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2168
1928 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1938 1 2179 1
1939} 2180}
1940 2181
1941############################################################################# 2182#############################################################################
1942 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1943package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1944 2224
1945our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1946 2226
1947use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1948 2228
1949my @tex = 2229my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1952 2232
1953sub new { 2233sub new {
1954 my $class = shift; 2234 my $class = shift;
1955 2235
… …
1992 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1993} 2273}
1994 2274
1995############################################################################# 2275#############################################################################
1996 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
1997package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
1998 2427
1999our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
2000 2429
2001use CFClient::OpenGL; 2430use CFPlus::OpenGL;
2002 2431
2003my %textures; 2432my %textures;
2004 2433
2005sub new { 2434sub new {
2006 my $class = shift; 2435 my $class = shift;
… …
2028 1 2457 1
2029} 2458}
2030 2459
2031############################################################################# 2460#############################################################################
2032 2461
2033package CFClient::UI::CheckBox;
2034
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image; 2462package CFPlus::UI::VGauge;
2102 2463
2103our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156}
2157
2158#############################################################################
2159
2160package CFClient::UI::VGauge;
2161
2162our @ISA = CFClient::UI::Base::;
2163 2465
2164use List::Util qw(min max); 2466use List::Util qw(min max);
2165 2467
2166use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2167 2469
2168my %tex = ( 2470my %tex = (
2169 food => [ 2471 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2474 ],
2173 grace => [ 2475 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176 ], 2478 ],
2177 hp => [ 2479 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2482 ],
2181 mana => [ 2483 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184 ], 2486 ],
2185); 2487);
2186 2488
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2551
2250 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2557
2253 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2275 2580
2276 if ($t3) { 2581 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2588 glEnd;
2284 } 2589 }
2285 2590
2286 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2288} 2593}
2289 2594
2290############################################################################# 2595#############################################################################
2291 2596
2292package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2293 2598
2294our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2295 2600
2296sub new { 2601sub new {
2297 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2298 2603
2299 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2301 can_hover => 1, 2606 can_hover => 1,
2302 can_events => 1, 2607 can_events => 1,
2303 %arg, 2608 %arg,
2304 ); 2609 );
2305 2610
2306 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309 2614
2310 $self 2615 $self
2311} 2616}
2312 2617
2313sub set_fontsize { 2618sub set_fontsize {
… …
2334 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2335} 2640}
2336 2641
2337############################################################################# 2642#############################################################################
2338 2643
2339package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2340 2645
2341use strict; 2646use strict;
2342 2647
2343use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2344 2649
2345our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2346 2651
2347my @tex = 2652my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2350 2655
2351sub new { 2656sub new {
2352 my $class = shift; 2657 my $class = shift;
2353 2658
… …
2442 } 2747 }
2443 2748
2444 1 2749 1
2445} 2750}
2446 2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2762}
2763
2447sub update { 2764sub update {
2448 my ($self) = @_; 2765 my ($self) = @_;
2449 2766
2450 delete $self->{knob_w}; 2767 delete $self->{knob_w};
2451 $self->SUPER::update; 2768 $self->SUPER::update;
… …
2498 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2499} 2816}
2500 2817
2501############################################################################# 2818#############################################################################
2502 2819
2503package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2504 2821
2505our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2506 2823
2507sub new { 2824sub new {
2508 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2509 2826
2510 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2511 2828
2512 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 2832 to_value => sub { shift },
2516 from_value => sub { shift }, 2833 from_value => sub { shift },
2517 %arg, 2834 %arg,
2518 ); 2835 );
2519 2836
… …
2539sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2541 2858
2542############################################################################# 2859#############################################################################
2543 2860
2544package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2545 2862
2546our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2547 2864
2548use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2549 2866
2550sub new { 2867sub new {
2551 my $class = shift; 2868 my $class = shift;
2552 2869
2553 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2554 fontsize => 1, 2871 fontsize => 1,
2555 can_events => 0, 2872 can_events => 1,
2556 indent => 0, 2873 indent => 0,
2557 #font => default_font 2874 #font => default_font
2558 @_, 2875 @_,
2559 2876
2560 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2561 par => [], 2878 par => [],
2879 max_par => 0,
2562 height => 0, 2880 height => 0,
2563 children => [ 2881 children => [
2564 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2566 ], 2884 ],
2567 ); 2885 );
2568 2886
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2570 2888
… …
2600 2918
2601 $self->reflow; 2919 $self->reflow;
2602 2920
2603 local $self->{children} = [$empty, $slider]; 2921 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2605} 2933}
2606 2934
2607sub get_layout { 2935sub get_layout {
2608 my ($self, $para) = @_; 2936 my ($self, $para) = @_;
2609 2937
… …
2637 2965
2638 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2640} 2968}
2641 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2642sub clear { 2985sub clear {
2643 my ($self) = @_; 2986 my ($self) = @_;
2644 2987
2645 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2649 $self->{height} = 0; 2992 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 2994}
2652 2995
2653sub add_paragraph { 2996sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2655 2998
2656 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2657
2658 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 3006 w => 1e10,
2660 wrapped => 1, 3007 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 3008 };
2666 3009
2667 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
2669 3017
2670 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2671 $self->update; 3019 $self->update;
2672} 3020}
2673 3021
2674sub scroll_to_bottom { 3022sub scroll_to_bottom {
2675 my ($self) = @_; 3023 my ($self) = @_;
2676 3024
2677 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3026 $self->update;
2679} 3027}
2680 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2681sub update { 3062sub update {
2682 my ($self) = @_; 3063 my ($self) = @_;
2683 3064
2684 $self->SUPER::update; 3065 $self->SUPER::update;
2685 3066
2686 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2687 3068
2688 delete $self->{texture}; 3069 delete $self->{texture};
2689 3070
2690 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3075
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2723 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2724 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2725 3089
2726 my $y0 = $top; 3090 my $y0 = $top;
2727 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2728 3092
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2737 3096
2738 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2741 3099
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3100 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 3101
2747 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3103 my @s = $layout->get_shapes;
2749 3104
2750 glDisable GL_BLEND;
2751 for (@w) { 3105 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3106 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3107
2754 $_->{x} = $dx + $para->{indent}; 3108 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3109 $_->{y} = $dy + $y - $y0;
2756 3110
2757 $_->draw; 3111 $_->draw;
2758 } 3112 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3113 }
2762 } 3114 }
2763 3115
2764 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3118 }
2766 3119
2767 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2768 }; 3121 };
2769 }); 3122 });
2770} 3123}
2771 3124
2772sub reconfigure { 3125sub reconfigure {
… …
2790 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2791} 3144}
2792 3145
2793############################################################################# 3146#############################################################################
2794 3147
2795package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2796 3149
2797use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2798 3151
2799our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2800 3153
2801sub moveto { 3154sub moveto {
2802 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2803 3156
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2832 glPopMatrix; 3185 glPopMatrix;
2833} 3186}
2834 3187
2835############################################################################# 3188#############################################################################
2836 3189
2837package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2838 3191
2839our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2840 3193
2841sub new { 3194sub new {
2842 my $class = shift; 3195 my $class = shift;
2843 3196
2844 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2856 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2857} 3210}
2858 3211
2859############################################################################# 3212#############################################################################
2860 3213
2861package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2862 3215
2863our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2864 3217
2865use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2866 3219
2867sub new { 3220sub new {
2868 my $class = shift; 3221 my $class = shift;
2869 3222
2870 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2873 ) 3226 )
2874} 3227}
2875 3228
2876sub set_tooltip_from { 3229sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2878 3234
2879 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2880 3236
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2886 } 3242 }
2887 3243
2888 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2890 3246
2891 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2892 markup => $tooltip, 3248 markup => $tooltip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894 fontsize => 0.8, 3250 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2896 ellipsise => 0, 3252 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3254 );
2899} 3255}
2900 3256
… …
2919 3275
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2922 or return; 3278 or return;
2923 3279
3280 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3282
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2928 3285
2929 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2930 }); 3290 });
2931} 3291}
2932 3292
2933sub _draw { 3293sub _draw {
2934 my ($self) = @_; 3294 my ($self) = @_;
… …
2958 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2959} 3319}
2960 3320
2961############################################################################# 3321#############################################################################
2962 3322
2963package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2964 3324
2965our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2966 3326
2967use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2968 3328
2969sub new { 3329sub new {
2970 my $class = shift; 3330 my $class = shift;
2971 3331
2972 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2974 can_events => 0, 3334 can_events => 0,
2975 @_, 3335 @_,
2976 ); 3336 );
2977 3337
2978 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2980 3340
2981 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1, 3343 hard => 1,
2984 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2985 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2986 ++$widget->{frame}; 3347 ++$widget->{frame};
2987 $widget->update; 3348 $widget->update;
2988 }, 3349 },
2989 ); 3350 );
2990 } 3351 }
… …
3007sub _draw { 3368sub _draw {
3008 my ($self) = @_; 3369 my ($self) = @_;
3009 3370
3010 return unless $::CONN; 3371 return unless $::CONN;
3011 3372
3373 $self->SUPER::_draw;
3374
3012 my $face; 3375 my $face;
3013 3376
3014 if ($self->{frame}) { 3377 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3016 3379
3017 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim; 3381 if $anim && @$anim;
3019 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3020 3386
3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3022 3388
3023 if ($tex) { 3389 if ($tex) {
3024 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3029 } 3399 }
3030} 3400}
3031 3401
3032sub destroy { 3402sub destroy {
3033 my ($self) = @_; 3403 my ($self) = @_;
… …
3038 $self->SUPER::destroy; 3408 $self->SUPER::destroy;
3039} 3409}
3040 3410
3041############################################################################# 3411#############################################################################
3042 3412
3043package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
3044 3414
3045our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
3046 3416
3047# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
3048 3418
3049############################################################################# 3419#############################################################################
3050 3420
3051package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
3052 3422
3053our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
3054 3424
3055use CFClient::OpenGL; 3425use CFPlus::OpenGL;
3056 3426
3057sub new { 3427sub new {
3058 my $class = shift; 3428 my $class = shift;
3059 3429
3060 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
3061 items => [], 3431 items => [],
3062 z => 100, 3432 z => 100,
3063 @_, 3433 @_,
3064 ); 3434 );
3065 3435
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067 3437
3068 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
3070 3440
3071 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
3072 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
3073 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3447 can_hover => 1,
3075 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
3076 markup => $widget, 3460 markup => $widget,
3077 tooltip => $tooltip 3461 tooltip => $tooltip;
3462 }
3078 } 3463 }
3079 3464
3080 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
3081 3466
3082 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
3125 1 3510 1
3126} 3511}
3127 3512
3128############################################################################# 3513#############################################################################
3129 3514
3130package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
3131 3516
3132our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
3133 3518
3134sub new { 3519sub new {
3135 my $class = shift; 3520 my $class = shift;
3136 3521
3137 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3151 3536
3152 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3154} 3539}
3155 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3156sub set_current_page { 3547sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3158 3549
3159 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3551 ? $page_or_widget
… …
3192 $self->{current}->draw; 3583 $self->{current}->draw;
3193} 3584}
3194 3585
3195############################################################################# 3586#############################################################################
3196 3587
3197package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3198 3589
3199our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3200 3591
3201sub new { 3592sub new {
3202 my $class = shift; 3593 my $class = shift;
3203 3594
3204 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3208 @_, 3599 @_,
3209 ); 3600 );
3210 3601
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3215} 3606}
3216 3607
3217sub add { 3608sub add {
3218 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3219 3610
3220 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3221 3612
3222 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3223 markup => $title, 3614 markup => $title,
3224 tooltip => $tooltip, 3615 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3617 );
3227 3618
3228 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3229} 3620}
3230 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3231sub set_current_page { 3628sub set_current_page {
3232 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3233 3630
3234 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 3633}
3237 3634
3238############################################################################# 3635#############################################################################
3239 3636
3240package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3241 3638
3242use utf8; 3639use utf8;
3243 3640
3244our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3245 3642
3246sub new { 3643sub new {
3247 my $class = shift; 3644 my $class = shift;
3248 3645
3249 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3266 my ($value, $title, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3267 3664
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 3666 }
3270 3667
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 3669}
3273 3670
3274sub _set_value { 3671sub _set_value {
3275 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3276 3673
… …
3291 $self->emit (changed => $value); 3688 $self->emit (changed => $value);
3292} 3689}
3293 3690
3294############################################################################# 3691#############################################################################
3295 3692
3296package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3297 3694
3298our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3299 3696
3300sub new { 3697sub new {
3301 my $class = shift; 3698 my $class = shift;
3302 3699
3303 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 3701 fontsize => 0.8,
3305 @_, 3702 @_,
3306 ); 3703 );
3307 3704
3308 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3309 3706
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311 3708
3312 $self 3709 $self
3313} 3710}
… …
3315sub reorder { 3712sub reorder {
3316 my ($self) = @_; 3713 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3318 3715
3319 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3323 3720
3324 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 3723 }
… …
3347 for ($short) { 3744 for ($short) {
3348 s/^\s+//; 3745 s/^\s+//;
3349 s/\s+/ /g; 3746 s/\s+/ /g;
3350 } 3747 }
3351 3748
3352 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3353 markup => $short, 3750 markup => $short,
3354 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3436 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3437} 3834}
3438 3835
3439############################################################################# 3836#############################################################################
3440 3837
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3606 3839
3607our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3608 3841
3609use List::Util qw(min max); 3842use List::Util qw(min max);
3610 3843
3611use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3612 3845
3613sub new { 3846sub new {
3614 my $class = shift; 3847 my $class = shift;
3615 3848
3616 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3617 visible => 1, 3850 visible => 1,
3618 @_, 3851 @_,
3619 ); 3852 );
3620 3853
3621 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3622 3855
3623 $self 3856 $self
3624} 3857}
3625 3858
3626sub size_request { 3859sub size_request {
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4026
3794 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3796 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3797 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3799 4041
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4068 glLoadIdentity;
3827 4069
3828 { 4070 {
3829 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3830 4072
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4075
3835 $self->_draw; 4076 $self->_draw;
4077 }
3836} 4078}
3837 4079
3838############################################################################# 4080#############################################################################
3839 4081
3840package CFClient::UI; 4082package CFPlus::UI;
3841 4083
3842$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844 4086
38451 40871
3846 4088

Diff Legend

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