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.327 by root, Mon Jul 17 01:41:53 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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) = @_;
… …
452 486
453 $FOCUS->emit ("focus_out") if $FOCUS; 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 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
593
594 delete $WIDGET{$self+0};
595 661
596 eval { $self->destroy }; 662 eval { $self->destroy };
597 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};
598} 666}
599 667
600############################################################################# 668#############################################################################
601 669
602package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
603 671
604our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
605 673
606use strict; 674use strict;
607use CFClient::OpenGL; 675use CFPlus::OpenGL;
608 676
609sub new { 677sub new {
610 my $class = shift; 678 my $class = shift;
611 679
612 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
643 } 711 }
644} 712}
645 713
646############################################################################# 714#############################################################################
647 715
648package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
649 717
650our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
651 719
652sub new { 720sub new {
653 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
655} 723}
… …
662 730
663sub draw { } 731sub draw { }
664 732
665############################################################################# 733#############################################################################
666 734
667package CFClient::UI::Container; 735package CFPlus::UI::Container;
668 736
669our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
670 738
671sub new { 739sub new {
672 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
673 741
674 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
683 if $children; 751 if $children;
684 752
685 $self 753 $self
686} 754}
687 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
688sub add { 764sub add {
689 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
690 766
691 $_->set_parent ($self) 767 $_->set_parent ($self)
692 for @widgets; 768 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
753} 829}
754 830
755############################################################################# 831#############################################################################
756 832
757package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
758 834
759our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
760 836
761sub new { 837sub new {
762 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
763 839
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 841
766 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
767} 843}
768 844
769sub add { 845sub add {
… …
776sub remove { 852sub remove {
777 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
778 854
779 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
780 856
781 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 858 unless @{$self->{children}};
783} 859}
784 860
785sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
786 862
… …
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $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 {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
949use List::Util qw(min max);
950
875our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
876 952
877sub new { 953sub new {
878 my $class = shift; 954 my $class = shift;
879 955
880 $class->SUPER::new ( 956 $class->SUPER::new (
… …
910} 986}
911 987
912sub set_offset { 988sub set_offset {
913 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
914 990
915 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
916 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
917 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
918 $self->update; 995 $self->update;
919} 996}
920 997
921# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 999sub coord2local {
… …
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1019 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1021 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1023 }
947} 1024}
948 1025
949sub _render { 1026sub _render {
950 my ($self) = @_; 1027 my ($self) = @_;
951 1028
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1031
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1033
957 $self->SUPER::_render; 1034 $self->SUPER::_render;
958} 1035}
959 1036
960############################################################################# 1037#############################################################################
961 1038
962package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
963 1040
964our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
965 1042
966sub new { 1043sub new {
967 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
968 1045
969 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
970 1047
971 my $self; 1048 my $self;
972 1049
973 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
974 vertical => 1, 1060 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1062 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1065 },
979 ; 1066 ;
980 1067
981 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
983 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
984 %arg, 1076 %arg,
985 ); 1077 );
986 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
988 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
989 1095
990 $self 1096 $self
991} 1097}
992 1098
… …
999} 1105}
1000 1106
1001sub update_slider { 1107sub update_slider {
1002 my ($self) = @_; 1108 my ($self) = @_;
1003 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1005} 1129}
1006 1130
1007sub update { 1131sub update {
1008 my ($self) = @_; 1132 my ($self) = @_;
1009 1133
1010 $self->SUPER::update; 1134 $self->SUPER::update;
1011
1012 $self->update_slider; 1135 $self->update_slider;
1136}
1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1013} 1189}
1014 1190
1015sub invoke_size_allocate { 1191sub invoke_size_allocate {
1016 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1017 1193
1018 $self->update_slider; 1194 $self->update_slider;
1019
1020 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1021} 1196}
1022 1197
1023############################################################################# 1198#############################################################################
1024 1199
1025package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1026 1201
1027our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1028 1203
1029use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1030 1205
1031sub new { 1206sub new {
1032 my $class = shift; 1207 my $class = shift;
1033 1208
1034 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1060 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1061} 1236}
1062 1237
1063############################################################################# 1238#############################################################################
1064 1239
1065package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1066 1241
1067our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1068 1243
1069use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1070 1345
1071my $bg = 1346my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1074 1349
1075my @border = 1350my @border =
1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078 1353
1079sub new { 1354sub new {
1080 my ($class, %arg) = @_; 1355 my ($class, %arg) = @_;
1081 1356
… …
1087 min_w => 64, 1362 min_w => 64,
1088 min_h => 32, 1363 min_h => 32,
1089 %arg, 1364 %arg,
1090 ); 1365 );
1091 1366
1092 $self->{title_widget} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1093 align => 0, 1368 align => 0,
1094 valign => 1, 1369 valign => 1,
1095 text => $self->{title}, 1370 text => $self->{title},
1096 fontsize => $self->{border}, 1371 fontsize => $self->{border},
1097 if exists $self->{title}; 1372 if exists $self->{title};
1098 1373
1099 if ($self->{has_close_button}) { 1374 if ($self->{has_close_button}) {
1100 $self->{close_button} = 1375 $self->{close_button} =
1101 new CFClient::UI::ImageButton 1376 new CFPlus::UI::ImageButton
1102 path => 'x1_close.png', 1377 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") }; 1378 on_activate => sub { $self->emit ("delete") };
1104 1379
1105 $self->CFClient::UI::Container::add ($self->{close_button}); 1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1106 } 1381 }
1107 1382
1108 $self 1383 $self
1109} 1384}
1110 1385
1111sub add { 1386sub add {
1112 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1113 1388
1114 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117} 1392}
1118 1393
1119sub border { 1394sub border {
1120 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1121} 1396}
… …
1229 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230 1505
1231 ! ! $self->{motion} 1506 ! ! $self->{motion}
1232} 1507}
1233 1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1515}
1516
1234sub _draw { 1517sub _draw {
1235 my ($self) = @_; 1518 my ($self) = @_;
1236 1519
1237 my $child = $self->{children}[0]; 1520 my $child = $self->{children}[0];
1238 1521
… …
1275 if $self->{close_button}; 1558 if $self->{close_button};
1276} 1559}
1277 1560
1278############################################################################# 1561#############################################################################
1279 1562
1280package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1281 1564
1282our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1283 1566
1284use List::Util qw(max sum); 1567use List::Util qw(max sum);
1285 1568
1286use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1287 1570
1288sub new { 1571sub new {
1289 my $class = shift; 1572 my $class = shift;
1290 1573
1291 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1292 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1293 @_, 1578 @_,
1294 ) 1579 )
1295} 1580}
1296 1581
1297sub children { 1582sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299} 1584}
1300 1585
1586# TODO: store row/col info in child widget and use standard add/del
1301sub add { 1587sub add {
1302 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1303 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1304 $child->set_parent ($self); 1592 $child->set_parent ($self);
1305 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1306 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1307 $self->realloc; 1598 $self->realloc;
1308} 1599}
1309 1600
1310sub remove { 1601sub remove {
1311 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1312 1603
1313 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1314} 1609}
1315 1610
1316# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1317sub clear { 1612sub clear {
1318 my ($self) = @_; 1613 my ($self) = @_;
… …
1367 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1368 1663
1369 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1370 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1371 1666
1372 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1373 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1374 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1375 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1376 1671
1377 # linearly scale sizes
1378 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380 1673
1381 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1382 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1383 1683
1384 my $y; 1684 my $y;
1385 1685
1386 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1387 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1430 } 1730 }
1431} 1731}
1432 1732
1433############################################################################# 1733#############################################################################
1434 1734
1435package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1436 1736
1737use List::Util qw(min max);
1738
1437our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1438 1820
1439sub size_request { 1821sub size_request {
1440 my ($self) = @_; 1822 my ($self) = @_;
1441 1823
1442 $self->{vertical} 1824 $self->{vertical}
… …
1475 $req[$_] += $space * $children[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children; 1858 for 0 .. $#children;
1477 } 1859 }
1478 } 1860 }
1479 1861
1480 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1481 1863
1482 my $pos = 0; 1864 my $pos = 0;
1483 for (0 .. $#children) { 1865 for (0 .. $#children) {
1484 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1490 1 1872 1
1491} 1873}
1492 1874
1493############################################################################# 1875#############################################################################
1494 1876
1495package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1496 1878
1497our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1498 1880
1499sub new { 1881sub new {
1500 my $class = shift; 1882 my $class = shift;
1501 1883
1502 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1505 ) 1887 )
1506} 1888}
1507 1889
1508############################################################################# 1890#############################################################################
1509 1891
1510package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1511 1893
1512our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1513 1895
1514sub new { 1896sub new {
1515 my $class = shift; 1897 my $class = shift;
1516 1898
1517 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1520 ) 1902 )
1521} 1903}
1522 1904
1523############################################################################# 1905#############################################################################
1524 1906
1525package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1526 1908
1527our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1528 1910
1529use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1530 1912
1531sub new { 1913sub new {
1532 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1533 1915
1534 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1537 #active_bg => none 1919 #active_bg => none
1538 #font => default_font 1920 #font => default_font
1539 #text => initial text 1921 #text => initial text
1540 #markup => initial narkup 1922 #markup => initial narkup
1541 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1542 ellipsise => 3, # end 1925 ellipsise => 3, # end
1543 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1544 fontsize => 1, 1927 fontsize => 1,
1545 align => -1, 1928 align => -1,
1546 valign => -1, 1929 valign => -1,
1547 padding_x => 2, 1930 padding_x => 2,
1548 padding_y => 2, 1931 padding_y => 2,
1549 can_events => 0, 1932 can_events => 0,
1550 %arg 1933 %arg
1551 ); 1934 );
1552 1935
1553 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1554 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1555 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1556 $self->{template} = $layout; 1939 $self->{template} = $layout;
1557 } 1940 }
1558 1941
1559 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1561 } else { 1944 } else {
1562 $self->set_text (delete $self->{text}); 1945 $self->set_text (delete $self->{text});
1563 } 1946 }
1564 1947
1565 $self 1948 $self
1566}
1567
1568sub escape($) {
1569 local $_ = $_[0];
1570
1571 s/&/&amp;/g;
1572 s/>/&gt;/g;
1573 s/</&lt;/g;
1574
1575 $_
1576} 1949}
1577 1950
1578sub update { 1951sub update {
1579 my ($self) = @_; 1952 my ($self) = @_;
1580 1953
… …
1707 }; 2080 };
1708 2081
1709 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2084
1712 $self->{layout}->render ($self->{ox}, $self->{oy}); 2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2086}
1714 2087
1715############################################################################# 2088#############################################################################
1716 2089
1717package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1718 2091
1719our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1720 2093
1721use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1722 2095
1723sub new { 2096sub new {
1724 my $class = shift; 2097 my $class = shift;
1725 2098
1726 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1731 can_hover => 1, 2104 can_hover => 1,
1732 can_focus => 1, 2105 can_focus => 1,
1733 valign => 0, 2106 valign => 0,
1734 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1735 #text => ... 2109 #text => ...
1736 #hidden => "*", 2110 #hidden => "*",
1737 @_ 2111 @_
1738 ) 2112 )
1739} 2113}
… …
1784 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1786 2160
1787 my $text = $self->get_text; 2161 my $text = $self->get_text;
1788 2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164
1789 if ($uni == 8) { 2165 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1798 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2189 $self->emit ('escape');
1803 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2194 } else {
1806 return 0; 2195 return 0;
1807 } 2196 }
1808 2197
1809 $self->_set_text ($text); 2198 $self->_set_text ($text);
1810 2199
1811 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1812 2202
1813 1 2203 1
1814} 2204}
1815 2205
1816sub invoke_focus_in { 2206sub invoke_focus_in {
… …
1878 utf8::encode $text; 2268 utf8::encode $text;
1879 2269
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2271 }
1882 2272
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2273 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2276 glEnd;
1888 } 2277 }
1889} 2278}
1890 2279
2280#############################################################################
2281
1891package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1892 2283
1893our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1894 2285
1895use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1896 2287
1897sub invoke_key_down { 2288sub invoke_key_down {
1898 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1899 2290
1900 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1901 2292
1902 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1905 2296
1906 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1909 $self->update; 2300 $self->update;
1910 2301
1911 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1914 } 2305 }
1915 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2310 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2312 }
1922 2313
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2317
1927 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2328 1
1938} 2329}
1939 2330
1940############################################################################# 2331#############################################################################
1941 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1942package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1943 2373
1944our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1945 2375
1946use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1947 2377
1948my @tex = 2378my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1951 2381
1952sub new { 2382sub new {
1953 my $class = shift; 2383 my $class = shift;
1954 2384
… …
1991 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1992} 2422}
1993 2423
1994############################################################################# 2424#############################################################################
1995 2425
2426package CFPlus::UI::CheckBox;
2427
2428our @ISA = CFPlus::UI::DrawBG::;
2429
2430my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433
2434use CFPlus::OpenGL;
2435
2436sub new {
2437 my $class = shift;
2438
2439 $class->SUPER::new (
2440 padding_x => 2,
2441 padding_y => 2,
2442 fg => [1, 1, 1],
2443 active_fg => [1, 1, 0],
2444 bg => [0, 0, 0, 0.2],
2445 active_bg => [1, 1, 1, 0.5],
2446 state => 0,
2447 can_hover => 1,
2448 @_
2449 )
2450}
2451
2452sub size_request {
2453 my ($self) = @_;
2454
2455 (6) x 2
2456}
2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
2466sub invoke_button_down {
2467 my ($self, $ev, $x, $y) = @_;
2468
2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2471 $self->toggle;
2472 } else {
2473 return 0
2474 }
2475
2476 1
2477}
2478
2479sub _draw {
2480 my ($self) = @_;
2481
2482 $self->SUPER::_draw;
2483
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2485
2486 my ($w, $h) = @$self{qw(w h)};
2487
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489
2490 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2491
2492 my $tex = $self->{state} ? $tex[1] : $tex[0];
2493
2494 glEnable GL_TEXTURE_2D;
2495 $tex->draw_quad_alpha (0, 0, $s, $s);
2496 glDisable GL_TEXTURE_2D;
2497}
2498
2499#############################################################################
2500
2501package CFPlus::UI::Image;
2502
2503our @ISA = CFPlus::UI::Base::;
2504
2505use CFPlus::OpenGL;
2506
2507our %texture_cache;
2508
2509sub new {
2510 my $class = shift;
2511
2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2516
2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2519
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2522
2523 CFPlus::weaken $texture_cache{$self->{path}};
2524
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526
2527 $self
2528}
2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2545sub size_request {
2546 my ($self) = @_;
2547
2548 ($self->{tex}{w}, $self->{tex}{h})
2549}
2550
2551sub _draw {
2552 my ($self) = @_;
2553
2554 my $tex = $self->{tex};
2555
2556 my ($w, $h) = ($self->{w}, $self->{h});
2557
2558 if ($self->{rot90}) {
2559 glRotate 90, 0, 0, 1;
2560 glTranslate 0, -$self->{w}, 0;
2561
2562 ($w, $h) = ($h, $w);
2563 }
2564
2565 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567
2568 $tex->draw_quad (0, 0, $w, $h);
2569
2570 glDisable GL_TEXTURE_2D;
2571}
2572
2573#############################################################################
2574
1996package CFClient::UI::ImageButton; 2575package CFPlus::UI::ImageButton;
1997 2576
1998our @ISA = CFClient::UI::Image::; 2577our @ISA = CFPlus::UI::Image::;
1999 2578
2000use CFClient::OpenGL; 2579use CFPlus::OpenGL;
2001 2580
2002my %textures; 2581my %textures;
2003 2582
2004sub new { 2583sub new {
2005 my $class = shift; 2584 my $class = shift;
… …
2027 1 2606 1
2028} 2607}
2029 2608
2030############################################################################# 2609#############################################################################
2031 2610
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2072sub invoke_button_down {
2073 my ($self, $ev, $x, $y) = @_;
2074
2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077 $self->toggle;
2078 } else {
2079 return 0
2080 }
2081
2082 1
2083}
2084
2085sub _draw {
2086 my ($self) = @_;
2087
2088 $self->SUPER::_draw;
2089
2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100 glEnable GL_TEXTURE_2D;
2101 $tex->draw_quad_alpha (0, 0, $s, $s);
2102 glDisable GL_TEXTURE_2D;
2103}
2104
2105#############################################################################
2106
2107package CFClient::UI::Image; 2611package CFPlus::UI::VGauge;
2108 2612
2109our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2110
2111use CFClient::OpenGL;
2112
2113our %texture_cache;
2114
2115sub new {
2116 my $class = shift;
2117
2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2122
2123 $self->{path} || $self->{tex}
2124 or Carp::croak "'path' or 'tex' attributes required";
2125
2126 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133 $self
2134}
2135
2136sub size_request {
2137 my ($self) = @_;
2138
2139 ($self->{tex}{w}, $self->{tex}{h})
2140}
2141
2142sub _draw {
2143 my ($self) = @_;
2144
2145 my $tex = $self->{tex};
2146
2147 my ($w, $h) = ($self->{w}, $self->{h});
2148
2149 if ($self->{rot90}) {
2150 glRotate 90, 0, 0, 1;
2151 glTranslate 0, -$self->{w}, 0;
2152
2153 ($w, $h) = ($h, $w);
2154 }
2155
2156 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159 $tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161 glDisable GL_TEXTURE_2D;
2162}
2163
2164#############################################################################
2165
2166package CFClient::UI::VGauge;
2167
2168our @ISA = CFClient::UI::Base::;
2169 2614
2170use List::Util qw(min max); 2615use List::Util qw(min max);
2171 2616
2172use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2173 2618
2174my %tex = ( 2619my %tex = (
2175 food => [ 2620 food => [
2176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178 ], 2623 ],
2179 grace => [ 2624 grace => [
2180 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182 ], 2627 ],
2183 hp => [ 2628 hp => [
2184 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186 ], 2631 ],
2187 mana => [ 2632 mana => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190 ], 2635 ],
2191); 2636);
2192 2637
2193# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2296 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2297} 2742}
2298 2743
2299############################################################################# 2744#############################################################################
2300 2745
2301package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2302 2747
2303our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2304 2749
2305sub new { 2750sub new {
2306 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2307 2752
2308 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2310 can_hover => 1, 2755 can_hover => 1,
2311 can_events => 1, 2756 can_events => 1,
2312 %arg, 2757 %arg,
2313 ); 2758 );
2314 2759
2315 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318 2763
2319 $self 2764 $self
2320} 2765}
2321 2766
2322sub set_fontsize { 2767sub set_fontsize {
… …
2343 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2344} 2789}
2345 2790
2346############################################################################# 2791#############################################################################
2347 2792
2348package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2349 2794
2350use strict; 2795use strict;
2351 2796
2352use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2353 2798
2354our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2355 2800
2356my @tex = 2801my @tex =
2357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2359 2804
2360sub new { 2805sub new {
2361 my $class = shift; 2806 my $class = shift;
2362 2807
… …
2451 } 2896 }
2452 2897
2453 1 2898 1
2454} 2899}
2455 2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2911}
2912
2456sub update { 2913sub update {
2457 my ($self) = @_; 2914 my ($self) = @_;
2458 2915
2459 delete $self->{knob_w}; 2916 delete $self->{knob_w};
2460 $self->SUPER::update; 2917 $self->SUPER::update;
… …
2507 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2508} 2965}
2509 2966
2510############################################################################# 2967#############################################################################
2511 2968
2512package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2513 2970
2514our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2515 2972
2516sub new { 2973sub new {
2517 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2518 2975
2519 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2520 2977
2521 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2522 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524 to_value => sub { shift }, 2981 to_value => sub { shift },
2525 from_value => sub { shift }, 2982 from_value => sub { shift },
2526 %arg, 2983 %arg,
2527 ); 2984 );
2528 2985
… …
2548sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2549sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2550 3007
2551############################################################################# 3008#############################################################################
2552 3009
2553package CFClient::UI::TextScroller; 3010package CFPlus::UI::TextScroller;
2554 3011
2555our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2556 3013
2557use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2558 3015
2559sub new { 3016sub new {
2560 my $class = shift; 3017 my $class = shift;
2561 3018
2562 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2563 fontsize => 1, 3020 fontsize => 1,
2564 can_events => 0, 3021 can_events => 1,
2565 indent => 0, 3022 indent => 0,
2566 #font => default_font 3023 #font => default_font
2567 @_, 3024 @_,
2568 3025
2569 layout => (new CFClient::Layout), 3026 layout => (new CFPlus::Layout),
2570 par => [], 3027 par => [],
3028 max_par => 0,
2571 height => 0, 3029 height => 0,
2572 children => [ 3030 children => [
2573 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2574 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2575 ], 3033 ],
2576 ); 3034 );
2577 3035
2578 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2579 3037
… …
2609 3067
2610 $self->reflow; 3068 $self->reflow;
2611 3069
2612 local $self->{children} = [$empty, $slider]; 3070 local $self->{children} = [$empty, $slider];
2613 $self->SUPER::invoke_size_allocate ($w, $h) 3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
2614} 3082}
2615 3083
2616sub get_layout { 3084sub get_layout {
2617 my ($self, $para) = @_; 3085 my ($self, $para) = @_;
2618 3086
… …
2646 3114
2647 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2648 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2649} 3117}
2650 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2651sub clear { 3134sub clear {
2652 my ($self) = @_; 3135 my ($self) = @_;
2653 3136
2654 my (undef, undef, @other) = @{ $self->{children} }; 3137 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other; 3138 $self->remove ($_) for @other;
… …
2658 $self->{height} = 0; 3141 $self->{height} = 0;
2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660} 3143}
2661 3144
2662sub add_paragraph { 3145sub add_paragraph {
2663 my ($self, $color, $para, $indent) = @_; 3146 my $self = shift;
2664 3147
2665 my ($text, @w) = ref $para ? @$para : $para; 3148 for my $para (@_) {
2666
2667 $para = { 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
2668 w => 1e10, 3155 w => 1e10,
2669 wrapped => 1, 3156 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2674 }; 3157 };
2675 3158
2676 $self->add (@w) if @w; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
2678 3166
2679 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2680 $self->update; 3168 $self->update;
2681} 3169}
2682 3170
2683sub scroll_to_bottom { 3171sub scroll_to_bottom {
2684 my ($self) = @_; 3172 my ($self) = @_;
2685 3173
2686 $self->{scroll_to_bottom} = 1; 3174 $self->{scroll_to} = $#{$self->{par}};
2687 $self->update; 3175 $self->update;
2688} 3176}
2689 3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
3200 $self->{height} = $height;
3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3202
3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
3209}
3210
2690sub update { 3211sub update {
2691 my ($self) = @_; 3212 my ($self) = @_;
2692 3213
2693 $self->SUPER::update; 3214 $self->SUPER::update;
2694 3215
2695 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2696 3217
2697 delete $self->{texture}; 3218 delete $self->{texture};
2698 3219
2699 $ROOT->on_post_alloc ($self => sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701 3224
2702 if (delete $self->{need_reflow}) {
2703 my $height = 0;
2704
2705 for my $para (@{$self->{par}}) {
2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707 my $layout = $self->get_layout ($para);
2708 my ($w, $h) = $layout->size;
2709
2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2713 }
2714
2715 $height += $para->{h};
2716 }
2717
2718 $self->{height} = $height;
2719
2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2731 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2732 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2733 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2734 3238
2735 my $y0 = $top; 3239 my $y0 = $top;
2736 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2737 3241
2738 my $y = 0;
2739
2740 for my $para (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2741 my $h = $para->{h}; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2742 3245
2743 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2744
2745 my $layout = $self->get_layout ($para); 3247 my $layout = $self->get_layout ($para);
2746 3248
2747 $layout->render ($para->{indent}, $y - $y0); 3249 $layout->render ($para->{indent}, $y - $y0);
2748 3250
2749 if (my @w = @{ $para->{widget} }) { 3251 if (my @w = @{ $para->{widget} }) {
… …
2758 $_->draw; 3260 $_->draw;
2759 } 3261 }
2760 } 3262 }
2761 } 3263 }
2762 3264
2763 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3267 }
3268
3269 $self->{top_paragraph} = $top_paragraph;
2765 }; 3270 };
2766 }); 3271 });
2767} 3272}
2768 3273
2769sub reconfigure { 3274sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2788} 3293}
2789 3294
2790############################################################################# 3295#############################################################################
2791 3296
2792package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2793 3298
2794use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2795 3300
2796our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2797 3302
2798sub moveto { 3303sub moveto {
2799 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2800 3305
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3334 glPopMatrix;
2830} 3335}
2831 3336
2832############################################################################# 3337#############################################################################
2833 3338
2834package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2835 3340
2836our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2837 3342
2838sub new { 3343sub new {
2839 my $class = shift; 3344 my $class = shift;
2840 3345
2841 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2854} 3359}
2855 3360
2856############################################################################# 3361#############################################################################
2857 3362
2858package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2859 3364
2860our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2861 3366
2862use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2863 3368
2864sub new { 3369sub new {
2865 my $class = shift; 3370 my $class = shift;
2866 3371
2867 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2870 ) 3375 )
2871} 3376}
2872 3377
2873sub set_tooltip_from { 3378sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3383
2876 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2877 3385
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3391 }
2884 3392
2885 $tooltip =~ s/^\n+//; 3393 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3394 $tooltip =~ s/\n+$//;
2887 3395
2888 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3397 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3399 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3401 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3403 );
2896} 3404}
2897 3405
… …
2916 3424
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2919 or return; 3427 or return;
2920 3428
3429 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3431
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3433 if $x + $self->{w} > $self->{root}{w};
2925 3434
2926 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2927 }); 3439 });
2928} 3440}
2929 3441
2930sub _draw { 3442sub _draw {
2931 my ($self) = @_; 3443 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2956} 3468}
2957 3469
2958############################################################################# 3470#############################################################################
2959 3471
2960package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2961 3473
2962our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2963 3475
2964use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2965 3477
2966sub new { 3478sub new {
2967 my $class = shift; 3479 my $class = shift;
2968 3480
2969 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2970 aspect => 1, 3484 aspect => 1,
2971 can_events => 0, 3485 can_events => 0,
2972 @_, 3486 @_,
2973 ); 3487 );
2974 3488
2975 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2977 3491
2978 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3494 hard => 1,
2981 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2982 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2983 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2984 $widget->update; 3501 $self->update;
2985 }, 3502 },
2986 ); 3503 );
3504
3505 $self->update_face;
2987 } 3506 }
2988 3507
2989 $self 3508 $self
2990} 3509}
2991 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2992sub size_request { 3524sub size_request {
2993 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2994} 3540}
2995 3541
2996sub update { 3542sub update {
2997 my ($self) = @_; 3543 my ($self) = @_;
2998 3544
… …
3004sub _draw { 3550sub _draw {
3005 my ($self) = @_; 3551 my ($self) = @_;
3006 3552
3007 return unless $::CONN; 3553 return unless $::CONN;
3008 3554
3009 my $face; 3555 $self->SUPER::_draw;
3010 3556
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3558 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3559
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3019 3561
3020 if ($tex) { 3562 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3035 $self->SUPER::destroy; 3577 $self->SUPER::destroy;
3036} 3578}
3037 3579
3038############################################################################# 3580#############################################################################
3039 3581
3040package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
3041 3583
3042our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
3043 3585
3044# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
3045 3587
3046############################################################################# 3588#############################################################################
3047 3589
3048package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
3049 3591
3050our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
3051 3593
3052use CFClient::OpenGL; 3594use CFPlus::OpenGL;
3053 3595
3054sub new { 3596sub new {
3055 my $class = shift; 3597 my $class = shift;
3056 3598
3057 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
3058 items => [], 3600 items => [],
3059 z => 100, 3601 z => 100,
3060 @_, 3602 @_,
3061 ); 3603 );
3062 3604
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3606
3065 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
3067 3609
3068 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
3069 if (!ref $widget) { 3611 if (!ref $widget) {
3070 if ($widget =~ /\t/) { 3612 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2; 3613 my ($left, $right) = split /\t/, $widget, 2;
3072 3614
3073 $widget = new CFClient::UI::HBox 3615 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3616 can_hover => 1,
3075 can_events => 1, 3617 can_events => 1,
3076 tooltip => $tooltip, 3618 tooltip => $tooltip,
3077 children => [ 3619 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1), 3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1), 3621 (new CFPlus::UI::Label markup => $right, align => +1),
3080 ], 3622 ],
3081 ; 3623 ;
3082 3624
3083 } else { 3625 } else {
3084 $widget = new CFClient::UI::Label 3626 $widget = new CFPlus::UI::Label
3085 can_hover => 1, 3627 can_hover => 1,
3086 can_events => 1, 3628 can_events => 1,
3087 markup => $widget, 3629 markup => $widget,
3088 tooltip => $tooltip; 3630 tooltip => $tooltip;
3089 } 3631 }
… …
3137 1 3679 1
3138} 3680}
3139 3681
3140############################################################################# 3682#############################################################################
3141 3683
3142package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
3143 3685
3144our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
3145 3687
3146sub new { 3688sub new {
3147 my $class = shift; 3689 my $class = shift;
3148 3690
3149 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3210 $self->{current}->draw; 3752 $self->{current}->draw;
3211} 3753}
3212 3754
3213############################################################################# 3755#############################################################################
3214 3756
3215package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3216 3758
3217our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3218 3760
3219sub new { 3761sub new {
3220 my $class = shift; 3762 my $class = shift;
3221 3763
3222 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3226 @_, 3768 @_,
3227 ); 3769 );
3228 3770
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233} 3775}
3234 3776
3235sub add { 3777sub add {
3236 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3237 3779
3238 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3239 3781
3240 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3241 markup => $title, 3783 markup => $title,
3242 tooltip => $tooltip, 3784 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3244 ); 3786 );
3245 3787
… …
3259 $self->emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3260} 3802}
3261 3803
3262############################################################################# 3804#############################################################################
3263 3805
3264package CFClient::UI::Combobox; 3806package CFPlus::UI::Selector;
3265 3807
3266use utf8; 3808use utf8;
3267 3809
3268our @ISA = CFClient::UI::Button::; 3810our @ISA = CFPlus::UI::Button::;
3269 3811
3270sub new { 3812sub new {
3271 my $class = shift; 3813 my $class = shift;
3272 3814
3273 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
… …
3290 my ($value, $title, $tooltip) = @$_; 3832 my ($value, $title, $tooltip) = @$_;
3291 3833
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 } 3835 }
3294 3836
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296} 3838}
3297 3839
3298sub _set_value { 3840sub _set_value {
3299 my ($self, $value) = @_; 3841 my ($self, $value) = @_;
3300 3842
… …
3315 $self->emit (changed => $value); 3857 $self->emit (changed => $value);
3316} 3858}
3317 3859
3318############################################################################# 3860#############################################################################
3319 3861
3320package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3321 3863
3322our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3323 3865
3324sub new { 3866sub new {
3325 my $class = shift; 3867 my $class = shift;
3326 3868
3327 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3328 fontsize => 0.8, 3870 fontsize => 0.8,
3329 @_, 3871 @_,
3330 ); 3872 );
3331 3873
3332 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3333 3875
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335 3877
3336 $self 3878 $self
3337} 3879}
… …
3339sub reorder { 3881sub reorder {
3340 my ($self) = @_; 3882 my ($self) = @_;
3341 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3342 3884
3343 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3347 3889
3348 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3349 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350 } 3892 }
… …
3371 for ($short) { 3913 for ($short) {
3372 s/^\s+//; 3914 s/^\s+//;
3373 s/\s+/ /g; 3915 s/\s+/ /g;
3374 } 3916 }
3375 3917
3376 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3377 markup => $short, 3919 markup => $short,
3378 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3379 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3380 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3381 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3460 $self->SUPER::destroy; 4002 $self->SUPER::destroy;
3461} 4003}
3462 4004
3463############################################################################# 4005#############################################################################
3464 4006
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root; 4007package CFPlus::UI::Root;
3630 4008
3631our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3632 4010
3633use List::Util qw(min max); 4011use List::Util qw(min max);
3634 4012
3635use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3636 4014
3637sub new { 4015sub new {
3638 my $class = shift; 4016 my $class = shift;
3639 4017
3640 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3641 visible => 1, 4019 visible => 1,
3642 @_, 4020 @_,
3643 ); 4021 );
3644 4022
3645 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3646 4024
3647 $self 4025 $self
3648} 4026}
3649 4027
3650sub size_request { 4028sub size_request {
… …
3819 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3820 4198
3821 $w = max $widget->{min_w}, $w; 4199 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h; 4200 $h = max $widget->{min_h}, $h;
3823 4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826 4207
3827 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4237 glLoadIdentity;
3857 4238
3858 { 4239 {
3859 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3860 4241
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4244
3865 $self->_draw; 4245 $self->_draw;
4246 }
3866} 4247}
3867 4248
3868############################################################################# 4249#############################################################################
3869 4250
3870package CFClient::UI; 4251package CFPlus::UI;
3871 4252
3872$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4255
38751 42561
3876 4257

Diff Legend

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