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

Diff Legend

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