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.377 by root, Mon Jul 16 20:20:30 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
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
986 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
987 1096
988 $self 1097 $self
989} 1098}
990 1099
… …
997} 1106}
998 1107
999sub update_slider { 1108sub update_slider {
1000 my ($self) = @_; 1109 my ($self) = @_;
1001 1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 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]); 1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1003} 1130}
1004 1131
1005sub update { 1132sub update {
1006 my ($self) = @_; 1133 my ($self) = @_;
1007 1134
1008 $self->SUPER::update; 1135 $self->SUPER::update;
1009
1010 $self->update_slider; 1136 $self->update_slider;
1137}
1138
1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 return 0 unless $ev->{dy}; # only vertical movements for now
1143
1144 $self->{vslider}->emit (mouse_wheel => $ev);
1145
1146 1
1147}
1148
1149sub invoke_button_down {
1150 my ($self, $ev, $x, $y) = @_;
1151
1152 if ($ev->{button} == 2) {
1153 $self->grab_focus;
1154
1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1160
1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162 $self->update;
1163 };
1164
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1011} 1190}
1012 1191
1013sub invoke_size_allocate { 1192sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1015 1194
1016 $self->update_slider; 1195 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1197}
1020 1198
1021############################################################################# 1199#############################################################################
1022 1200
1023package CFClient::UI::Frame; 1201package CFPlus::UI::Frame;
1024 1202
1025our @ISA = CFClient::UI::Bin::; 1203our @ISA = CFPlus::UI::Bin::;
1026 1204
1027use CFClient::OpenGL; 1205use CFPlus::OpenGL;
1028 1206
1029sub new { 1207sub new {
1030 my $class = shift; 1208 my $class = shift;
1031 1209
1032 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1236 $self->SUPER::_draw;
1059} 1237}
1060 1238
1061############################################################################# 1239#############################################################################
1062 1240
1063package CFClient::UI::FancyFrame; 1241package CFPlus::UI::FancyFrame;
1064 1242
1065our @ISA = CFClient::UI::Bin::; 1243our @ISA = CFPlus::UI::Bin::;
1066 1244
1067use CFClient::OpenGL; 1245use CFPlus::OpenGL;
1246
1247sub new {
1248 my ($class, %arg) = @_;
1249
1250 if ((exists $arg{label}) && !ref $arg{label}) {
1251 $arg{label} = new CFPlus::UI::Label
1252 align => 1,
1253 valign => 0,
1254 text => $arg{label},
1255 fontsize => ($arg{border} || 0.8) * 0.75;
1256 }
1257
1258 my $self = $class->SUPER::new (
1259 # label => "",
1260 fg => [0.6, 0.3, 0.1],
1261 border => 0.8,
1262 style => 'single',
1263 %arg,
1264 );
1265
1266 $self
1267}
1268
1269sub add {
1270 my ($self, @widgets) = @_;
1271
1272 $self->SUPER::add (@widgets);
1273 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1274}
1275
1276sub border {
1277 int $_[0]{border} * $::FONTSIZE
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{label_w}, undef) = $self->{label}->size_request
1284 if $self->{label};
1285
1286 my ($w, $h) = $self->SUPER::size_request;
1287
1288 (
1289 $w + $self->border * 2,
1290 $h + $self->border * 2,
1291 )
1292}
1293
1294sub invoke_size_allocate {
1295 my ($self, $w, $h) = @_;
1296
1297 my $border = $self->border;
1298
1299 $w -= List::Util::max 0, $border * 2;
1300 $h -= List::Util::max 0, $border * 2;
1301
1302 if (my $label = $self->{label}) {
1303 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1304 $label->{h} = List::Util::min $h, $border;
1305 $label->invoke_size_allocate ($label->{w}, $label->{h});
1306 }
1307
1308 $self->child->configure ($border, $border, $w, $h);
1309
1310 1
1311}
1312
1313sub _draw {
1314 my ($self) = @_;
1315
1316 my $child = $self->{children}[0];
1317
1318 my $border = $self->border;
1319 my ($w, $h) = ($self->{w}, $self->{h});
1320
1321 $child->draw;
1322
1323 glColor @{$self->{fg}};
1324 glBegin GL_LINE_STRIP;
1325 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1330 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1331 glEnd;
1332
1333 if ($self->{label}) {
1334 glTranslate $border * 2, 0;
1335 $self->{label}->_draw;
1336 }
1337}
1338
1339#############################################################################
1340
1341package CFPlus::UI::Toplevel;
1342
1343our @ISA = CFPlus::UI::Bin::;
1344
1345use CFPlus::OpenGL;
1068 1346
1069my $bg = 1347my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1348 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1349 mipmap => 1, wrap => 1;
1072 1350
1073my @border = 1351my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1352 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); 1353 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1354
1077sub new { 1355sub new {
1078 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1079 1357
1080 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1361 border => 0.6,
1084 can_events => 1, 1362 can_events => 1,
1085 min_w => 16, 1363 min_w => 64,
1086 min_h => 16, 1364 min_h => 32,
1087 %arg, 1365 %arg,
1088 ); 1366 );
1089 1367
1090 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1369 align => 0,
1092 valign => 1, 1370 valign => 1,
1093 text => $self->{title}, 1371 text => $self->{title},
1094 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1095 if exists $self->{title}; 1373 if exists $self->{title};
1096 1374
1097 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1376 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1378 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1102 1380
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1382 }
1105 1383
1106 $self 1384 $self
1107} 1385}
1108 1386
1109sub add { 1387sub add {
1110 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1111 1389
1112 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1393}
1116 1394
1117sub border { 1395sub border {
1118 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1119} 1397}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1506
1229 ! ! $self->{motion} 1507 ! ! $self->{motion}
1230} 1508}
1231 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1232sub _draw { 1518sub _draw {
1233 my ($self) = @_; 1519 my ($self) = @_;
1234 1520
1235 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1236 1522
… …
1273 if $self->{close_button}; 1559 if $self->{close_button};
1274} 1560}
1275 1561
1276############################################################################# 1562#############################################################################
1277 1563
1278package CFClient::UI::Table; 1564package CFPlus::UI::Table;
1279 1565
1280our @ISA = CFClient::UI::Base::; 1566our @ISA = CFPlus::UI::Base::;
1281 1567
1282use List::Util qw(max sum); 1568use List::Util qw(max sum);
1283 1569
1284use CFClient::OpenGL; 1570use CFPlus::OpenGL;
1285 1571
1286sub new { 1572sub new {
1287 my $class = shift; 1573 my $class = shift;
1288 1574
1289 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1290 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1291 @_, 1579 @_,
1292 ) 1580 )
1293} 1581}
1294 1582
1295sub children { 1583sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1585}
1298 1586
1587# TODO: store row/col info in child widget and use standard add/del
1299sub add { 1588sub add {
1300 my ($self, $x, $y, $child) = @_; 1589 my ($self) = shift;
1301 1590
1591 while (@_) {
1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1593 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1595 }
1304 1596
1597 $self->{force_realloc} = 1;
1598 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1599 $self->realloc;
1306} 1600}
1307 1601
1308sub remove { 1602sub remove {
1309 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1310 1604
1311 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1312} 1610}
1313 1611
1314# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1315sub clear { 1613sub clear {
1316 my ($self) = @_; 1614 my ($self) = @_;
… …
1365 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1366 1664
1367 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1369 1667
1370 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1371 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1374 1672
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1674
1379 CFClient::UI::harmonize $ws; 1675 CFPlus::UI::harmonize $ws;
1676
1677 my @row_expand = @{$self->{row_expand}};
1678 @row_expand = (1) x @$ws unless @row_expand;
1679 my $row_expand = (sum @row_expand) || 1;
1680
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682
1380 CFClient::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1381 1684
1382 my $y; 1685 my $y;
1383 1686
1384 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1688 my $row = $self->{children}[$r]
… …
1428 } 1731 }
1429} 1732}
1430 1733
1431############################################################################# 1734#############################################################################
1432 1735
1433package CFClient::UI::Box; 1736package CFPlus::UI::Fixed;
1434 1737
1738use List::Util qw(min max);
1739
1435our @ISA = CFClient::UI::Container::; 1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1814}
1815
1816#############################################################################
1817
1818package CFPlus::UI::Box;
1819
1820our @ISA = CFPlus::UI::Container::;
1436 1821
1437sub size_request { 1822sub size_request {
1438 my ($self) = @_; 1823 my ($self) = @_;
1439 1824
1440 $self->{vertical} 1825 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1858 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1859 for 0 .. $#children;
1475 } 1860 }
1476 } 1861 }
1477 1862
1478 CFClient::UI::harmonize \@req; 1863 CFPlus::UI::harmonize \@req;
1479 1864
1480 my $pos = 0; 1865 my $pos = 0;
1481 for (0 .. $#children) { 1866 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1867 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1868 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1873 1
1489} 1874}
1490 1875
1491############################################################################# 1876#############################################################################
1492 1877
1493package CFClient::UI::HBox; 1878package CFPlus::UI::HBox;
1494 1879
1495our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1496 1881
1497sub new { 1882sub new {
1498 my $class = shift; 1883 my $class = shift;
1499 1884
1500 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1503 ) 1888 )
1504} 1889}
1505 1890
1506############################################################################# 1891#############################################################################
1507 1892
1508package CFClient::UI::VBox; 1893package CFPlus::UI::VBox;
1509 1894
1510our @ISA = CFClient::UI::Box::; 1895our @ISA = CFPlus::UI::Box::;
1511 1896
1512sub new { 1897sub new {
1513 my $class = shift; 1898 my $class = shift;
1514 1899
1515 $class->SUPER::new ( 1900 $class->SUPER::new (
… …
1518 ) 1903 )
1519} 1904}
1520 1905
1521############################################################################# 1906#############################################################################
1522 1907
1523package CFClient::UI::Label; 1908package CFPlus::UI::Label;
1524 1909
1525our @ISA = CFClient::UI::DrawBG::; 1910our @ISA = CFPlus::UI::DrawBG::;
1526 1911
1527use CFClient::OpenGL; 1912use CFPlus::OpenGL;
1528 1913
1529sub new { 1914sub new {
1530 my ($class, %arg) = @_; 1915 my ($class, %arg) = @_;
1531 1916
1532 my $self = $class->SUPER::new ( 1917 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1920 #active_bg => none
1536 #font => default_font 1921 #font => default_font
1537 #text => initial text 1922 #text => initial text
1538 #markup => initial narkup 1923 #markup => initial narkup
1539 #max_w => maximum pixel width 1924 #max_w => maximum pixel width
1925 #style => 0, # render flags
1540 ellipsise => 3, # end 1926 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1927 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1928 fontsize => 1,
1543 align => -1, 1929 align => -1,
1544 valign => -1, 1930 valign => -1,
1545 padding_x => 2, 1931 padding_x => 2,
1546 padding_y => 2, 1932 padding_y => 2,
1547 can_events => 0, 1933 can_events => 0,
1548 %arg 1934 %arg
1549 ); 1935 );
1550 1936
1551 if (exists $self->{template}) { 1937 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1938 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1939 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1940 $self->{template} = $layout;
1555 } 1941 }
1556 1942
1557 if (exists $self->{markup}) { 1943 if (exists $self->{markup}) {
… …
1559 } else { 1945 } else {
1560 $self->set_text (delete $self->{text}); 1946 $self->set_text (delete $self->{text});
1561 } 1947 }
1562 1948
1563 $self 1949 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1950}
1575 1951
1576sub update { 1952sub update {
1577 my ($self) = @_; 1953 my ($self) = @_;
1578 1954
… …
1705 }; 2081 };
1706 2082
1707 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2083 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2084 my $h = List::Util::min $self->{h} + 2, $size->[1];
1709 2085
1710 $self->{layout}->render ($self->{ox}, $self->{oy}); 2086 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711} 2087}
1712 2088
1713############################################################################# 2089#############################################################################
1714 2090
1715package CFClient::UI::EntryBase; 2091package CFPlus::UI::EntryBase;
1716 2092
1717our @ISA = CFClient::UI::Label::; 2093our @ISA = CFPlus::UI::Label::;
1718 2094
1719use CFClient::OpenGL; 2095use CFPlus::OpenGL;
1720 2096
1721sub new { 2097sub new {
1722 my $class = shift; 2098 my $class = shift;
1723 2099
1724 $class->SUPER::new ( 2100 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2104 active_fg => [0, 0, 0],
1729 can_hover => 1, 2105 can_hover => 1,
1730 can_focus => 1, 2106 can_focus => 1,
1731 valign => 0, 2107 valign => 0,
1732 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
1733 #text => ... 2110 #text => ...
1734 #hidden => "*", 2111 #hidden => "*",
1735 @_ 2112 @_
1736 ) 2113 )
1737} 2114}
… …
1782 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1784 2161
1785 my $text = $self->get_text; 2162 my $text = $self->get_text;
1786 2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2165
1787 if ($uni == 8) { 2166 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2174 } elsif ($sym == CFPlus::SDLK_HOME) {
2175 # what a hack
2176 $self->{cursor} =
2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178 ? length $1
2179 : 0;
2180 } elsif ($sym == CFPlus::SDLK_END) {
2181 # uh, again
2182 $self->{cursor} =
2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2184 ? $self->{cursor} + length $1
2185 : length $self->{text};
2186 } elsif ($uni == 21) { # ctrl-u
2187 $text = "";
1796 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2190 $self->emit ('escape');
1801 } elsif ($uni) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2195 } else {
1804 return 0; 2196 return 0;
1805 } 2197 }
1806 2198
1807 $self->_set_text ($text); 2199 $self->_set_text ($text);
1808 2200
1809 $self->realloc; 2201 $self->realloc;
2202 $self->update;
1810 2203
1811 1 2204 1
1812} 2205}
1813 2206
1814sub invoke_focus_in { 2207sub invoke_focus_in {
… …
1826 2219
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2220 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2221
1829 # byte-index to char-index 2222 # byte-index to char-index
1830 my $text = $self->{text}; 2223 my $text = $self->{text};
1831 utf8::encode $text; 2224 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2225 $self->{cursor} = length $text;
1833 2226
1834 $self->_set_text ($self->{text}); 2227 $self->_set_text ($self->{text});
1835 $self->update; 2228 $self->update;
1836 2229
1837 1 2230 1
… …
1876 utf8::encode $text; 2269 utf8::encode $text;
1877 2270
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2271 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2272 }
1880 2273
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2274 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 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}; 2276 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2277 glEnd;
1886 } 2278 }
1887} 2279}
1888 2280
2281#############################################################################
2282
1889package CFClient::UI::Entry; 2283package CFPlus::UI::Entry;
1890 2284
1891our @ISA = CFClient::UI::EntryBase::; 2285our @ISA = CFPlus::UI::EntryBase::;
1892 2286
1893use CFClient::OpenGL; 2287use CFPlus::OpenGL;
1894 2288
1895sub invoke_key_down { 2289sub invoke_key_down {
1896 my ($self, $ev) = @_; 2290 my ($self, $ev) = @_;
1897 2291
1898 my $sym = $ev->{sym}; 2292 my $sym = $ev->{sym};
1899 2293
1900 if ($sym == 13) { 2294 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2295 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2296 my $txt = $self->get_text;
1903 2297
1904 $self->{history_pointer} = -1; 2298 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2299 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2300 $self->emit (activate => $txt);
1907 $self->update; 2301 $self->update;
1908 2302
1909 } elsif ($sym == CFClient::SDLK_UP) { 2303 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2304 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2305 $self->{history_saveback} = $self->get_text;
1912 } 2306 }
1913 if (@{$self->{history} || []} > 0) { 2307 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2308 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2310 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2311 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2312 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2313 }
1920 2314
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2315 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2316 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2317 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2318
1925 if ($self->{history_pointer} >= 0) { 2319 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2320 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2329 1
1936} 2330}
1937 2331
1938############################################################################# 2332#############################################################################
1939 2333
2334package CFPlus::UI::TextEdit;
2335
2336our @ISA = CFPlus::UI::EntryBase::;
2337
2338use CFPlus::OpenGL;
2339
2340sub move_cursor_ver {
2341 my ($self, $dy) = @_;
2342
2343 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2344
2345 $y += $dy;
2346
2347 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2348 $self->{cursor} = $index;
2349 delete $self->{cur_h};
2350 $self->update;
2351 return;
2352 }
2353}
2354
2355sub invoke_key_down {
2356 my ($self, $ev) = @_;
2357
2358 my $sym = $ev->{sym};
2359
2360 if ($sym == CFPlus::SDLK_UP) {
2361 $self->move_cursor_ver (-1);
2362 } elsif ($sym == CFPlus::SDLK_DOWN) {
2363 $self->move_cursor_ver (+1);
2364 } else {
2365 return $self->SUPER::invoke_key_down ($ev)
2366 }
2367
2368 1
2369}
2370
2371#############################################################################
2372
1940package CFClient::UI::Button; 2373package CFPlus::UI::Button;
1941 2374
1942our @ISA = CFClient::UI::Label::; 2375our @ISA = CFPlus::UI::Label::;
1943 2376
1944use CFClient::OpenGL; 2377use CFPlus::OpenGL;
1945 2378
1946my @tex = 2379my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2381 qw(b1_button_active.png);
1949 2382
1950sub new { 2383sub new {
1951 my $class = shift; 2384 my $class = shift;
1952 2385
… …
1989 $self->SUPER::_draw; 2422 $self->SUPER::_draw;
1990} 2423}
1991 2424
1992############################################################################# 2425#############################################################################
1993 2426
2427package CFPlus::UI::CheckBox;
2428
2429our @ISA = CFPlus::UI::DrawBG::;
2430
2431my @tex =
2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2433 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2434
2435use CFPlus::OpenGL;
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 padding_x => 2,
2442 padding_y => 2,
2443 fg => [1, 1, 1],
2444 active_fg => [1, 1, 0],
2445 bg => [0, 0, 0, 0.2],
2446 active_bg => [1, 1, 1, 0.5],
2447 state => 0,
2448 can_hover => 1,
2449 @_
2450 )
2451}
2452
2453sub size_request {
2454 my ($self) = @_;
2455
2456 (6) x 2
2457}
2458
2459sub toggle {
2460 my ($self) = @_;
2461
2462 $self->{state} = !$self->{state};
2463 $self->emit (changed => $self->{state});
2464 $self->update;
2465}
2466
2467sub invoke_button_down {
2468 my ($self, $ev, $x, $y) = @_;
2469
2470 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2471 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2472 $self->toggle;
2473 } else {
2474 return 0
2475 }
2476
2477 1
2478}
2479
2480sub _draw {
2481 my ($self) = @_;
2482
2483 $self->SUPER::_draw;
2484
2485 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2486
2487 my ($w, $h) = @$self{qw(w h)};
2488
2489 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2490
2491 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2492
2493 my $tex = $self->{state} ? $tex[1] : $tex[0];
2494
2495 glEnable GL_TEXTURE_2D;
2496 $tex->draw_quad_alpha (0, 0, $s, $s);
2497 glDisable GL_TEXTURE_2D;
2498}
2499
2500#############################################################################
2501
2502package CFPlus::UI::Image;
2503
2504our @ISA = CFPlus::UI::Base::;
2505
2506use CFPlus::OpenGL;
2507
2508our %texture_cache;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my $self = $class->SUPER::new (
2514 can_events => 0,
2515 @_,
2516 );
2517
2518 $self->{path} || $self->{tex}
2519 or Carp::croak "'path' or 'tex' attributes required";
2520
2521 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2522 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2523
2524 CFPlus::weaken $texture_cache{$self->{path}};
2525
2526 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2527
2528 $self
2529}
2530
2531sub STORABLE_freeze {
2532 my ($self, $cloning) = @_;
2533
2534 $self->{path}
2535 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2536
2537 $self->{path}
2538}
2539
2540sub STORABLE_attach {
2541 my ($self, $cloning, $path) = @_;
2542
2543 $self->new (path => $path)
2544}
2545
2546sub size_request {
2547 my ($self) = @_;
2548
2549 ($self->{tex}{w}, $self->{tex}{h})
2550}
2551
2552sub _draw {
2553 my ($self) = @_;
2554
2555 my $tex = $self->{tex};
2556
2557 my ($w, $h) = ($self->{w}, $self->{h});
2558
2559 if ($self->{rot90}) {
2560 glRotate 90, 0, 0, 1;
2561 glTranslate 0, -$self->{w}, 0;
2562
2563 ($w, $h) = ($h, $w);
2564 }
2565
2566 glEnable GL_TEXTURE_2D;
2567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2568
2569 $tex->draw_quad (0, 0, $w, $h);
2570
2571 glDisable GL_TEXTURE_2D;
2572}
2573
2574#############################################################################
2575
1994package CFClient::UI::ImageButton; 2576package CFPlus::UI::ImageButton;
1995 2577
1996our @ISA = CFClient::UI::Image::; 2578our @ISA = CFPlus::UI::Image::;
1997 2579
1998use CFClient::OpenGL; 2580use CFPlus::OpenGL;
1999 2581
2000my %textures; 2582my %textures;
2001 2583
2002sub new { 2584sub new {
2003 my $class = shift; 2585 my $class = shift;
… …
2025 1 2607 1
2026} 2608}
2027 2609
2028############################################################################# 2610#############################################################################
2029 2611
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; 2612package CFPlus::UI::VGauge;
2106 2613
2107our @ISA = CFClient::UI::Base::; 2614our @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 2615
2168use List::Util qw(min max); 2616use List::Util qw(min max);
2169 2617
2170use CFClient::OpenGL; 2618use CFPlus::OpenGL;
2171 2619
2172my %tex = ( 2620my %tex = (
2173 food => [ 2621 food => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2622 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2623 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176 ], 2624 ],
2177 grace => [ 2625 grace => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2626 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/ 2627 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180 ], 2628 ],
2181 hp => [ 2629 hp => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2630 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2631 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184 ], 2632 ],
2185 mana => [ 2633 mana => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2634 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/ 2635 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188 ], 2636 ],
2189); 2637);
2190 2638
2191# eg. VGauge->new (gauge => 'food'), default gauge: food 2639# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2294 glDisable GL_TEXTURE_2D; 2742 glDisable GL_TEXTURE_2D;
2295} 2743}
2296 2744
2297############################################################################# 2745#############################################################################
2298 2746
2299package CFClient::UI::Gauge; 2747package CFPlus::UI::Gauge;
2300 2748
2301our @ISA = CFClient::UI::VBox::; 2749our @ISA = CFPlus::UI::VBox::;
2302 2750
2303sub new { 2751sub new {
2304 my ($class, %arg) = @_; 2752 my ($class, %arg) = @_;
2305 2753
2306 my $self = $class->SUPER::new ( 2754 my $self = $class->SUPER::new (
… …
2308 can_hover => 1, 2756 can_hover => 1,
2309 can_events => 1, 2757 can_events => 1,
2310 %arg, 2758 %arg,
2311 ); 2759 );
2312 2760
2313 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2761 $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); 2762 $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"); 2763 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316 2764
2317 $self 2765 $self
2318} 2766}
2319 2767
2320sub set_fontsize { 2768sub set_fontsize {
… …
2341 $self->{value}->set_text ($val); 2789 $self->{value}->set_text ($val);
2342} 2790}
2343 2791
2344############################################################################# 2792#############################################################################
2345 2793
2346package CFClient::UI::Slider; 2794package CFPlus::UI::Slider;
2347 2795
2348use strict; 2796use strict;
2349 2797
2350use CFClient::OpenGL; 2798use CFPlus::OpenGL;
2351 2799
2352our @ISA = CFClient::UI::DrawBG::; 2800our @ISA = CFPlus::UI::DrawBG::;
2353 2801
2354my @tex = 2802my @tex =
2355 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2803 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356 qw(s1_slider.png s1_slider_bg.png); 2804 qw(s1_slider.png s1_slider_bg.png);
2357 2805
2358sub new { 2806sub new {
2359 my $class = shift; 2807 my $class = shift;
2360 2808
… …
2449 } 2897 }
2450 2898
2451 1 2899 1
2452} 2900}
2453 2901
2902sub invoke_mouse_wheel {
2903 my ($self, $ev) = @_;
2904
2905 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2906
2907 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908
2909 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2910
2911 ! ! $delta
2912}
2913
2454sub update { 2914sub update {
2455 my ($self) = @_; 2915 my ($self) = @_;
2456 2916
2457 delete $self->{knob_w}; 2917 delete $self->{knob_w};
2458 $self->SUPER::update; 2918 $self->SUPER::update;
… …
2505 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2506} 2966}
2507 2967
2508############################################################################# 2968#############################################################################
2509 2969
2510package CFClient::UI::ValSlider; 2970package CFPlus::UI::ValSlider;
2511 2971
2512our @ISA = CFClient::UI::HBox::; 2972our @ISA = CFPlus::UI::HBox::;
2513 2973
2514sub new { 2974sub new {
2515 my ($class, %arg) = @_; 2975 my ($class, %arg) = @_;
2516 2976
2517 my $range = delete $arg{range}; 2977 my $range = delete $arg{range};
2518 2978
2519 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2520 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2980 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2981 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522 to_value => sub { shift }, 2982 to_value => sub { shift },
2523 from_value => sub { shift }, 2983 from_value => sub { shift },
2524 %arg, 2984 %arg,
2525 ); 2985 );
2526 2986
… …
2546sub set_range { shift->{slider}->set_range (@_) } 3006sub set_range { shift->{slider}->set_range (@_) }
2547sub set_value { shift->{slider}->set_value (@_) } 3007sub set_value { shift->{slider}->set_value (@_) }
2548 3008
2549############################################################################# 3009#############################################################################
2550 3010
2551package CFClient::UI::TextScroller; 3011package CFPlus::UI::TextScroller;
2552 3012
2553our @ISA = CFClient::UI::HBox::; 3013our @ISA = CFPlus::UI::HBox::;
2554 3014
2555use CFClient::OpenGL; 3015use CFPlus::OpenGL;
2556 3016
2557sub new { 3017sub new {
2558 my $class = shift; 3018 my $class = shift;
2559 3019
2560 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
2561 fontsize => 1, 3021 fontsize => 1,
2562 can_events => 0, 3022 can_events => 1,
2563 indent => 0, 3023 indent => 0,
2564 #font => default_font 3024 #font => default_font
2565 @_, 3025 @_,
2566 3026
2567 layout => (new CFClient::Layout), 3027 layout => (new CFPlus::Layout),
2568 par => [], 3028 par => [],
3029 max_par => 0,
2569 height => 0, 3030 height => 0,
2570 children => [ 3031 children => [
2571 (new CFClient::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2572 (new CFClient::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2573 ], 3034 ],
2574 ); 3035 );
2575 3036
2576 $self->{children}[1]->connect (changed => sub { $self->update }); 3037 $self->{children}[1]->connect (changed => sub { $self->update });
2577 3038
… …
2607 3068
2608 $self->reflow; 3069 $self->reflow;
2609 3070
2610 local $self->{children} = [$empty, $slider]; 3071 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 3072 $self->SUPER::invoke_size_allocate ($w, $h)
3073}
3074
3075sub invoke_mouse_wheel {
3076 my ($self, $ev) = @_;
3077
3078 return 0 unless $ev->{dy}; # only vertical movements
3079
3080 $self->{children}[1]->emit (mouse_wheel => $ev);
3081
3082 1
2612} 3083}
2613 3084
2614sub get_layout { 3085sub get_layout {
2615 my ($self, $para) = @_; 3086 my ($self, $para) = @_;
2616 3087
… …
2644 3115
2645 # todo: base offset on lines or so, not on pixels 3116 # todo: base offset on lines or so, not on pixels
2646 $self->{children}[1]->set_value ($offset); 3117 $self->{children}[1]->set_value ($offset);
2647} 3118}
2648 3119
3120sub current_paragraph {
3121 my ($self) = @_;
3122
3123 $self->{top_paragraph} - 1
3124}
3125
3126sub scroll_to {
3127 my ($self, $para) = @_;
3128
3129 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3130
3131 $self->{scroll_to} = $para;
3132 $self->update;
3133}
3134
2649sub clear { 3135sub clear {
2650 my ($self) = @_; 3136 my ($self) = @_;
2651 3137
2652 my (undef, undef, @other) = @{ $self->{children} }; 3138 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other; 3139 $self->remove ($_) for @other;
… …
2656 $self->{height} = 0; 3142 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3143 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 3144}
2659 3145
2660sub add_paragraph { 3146sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 3147 my $self = shift;
2662 3148
2663 my ($text, @w) = ref $para ? @$para : $para; 3149 for my $para (@_) {
2664
2665 $para = { 3150 $para = {
3151 fg => [1, 1, 1, 1],
3152 indent => 0,
3153 markup => "",
3154 widget => [],
3155 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 3156 w => 1e10,
2667 wrapped => 1, 3157 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 3158 };
2673 3159
2674 $self->add (@w) if @w; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 3161 push @{$self->{par}}, $para;
3162 }
3163
3164 if (my $max = $self->{max_par}) {
3165 shift @{$self->{par}} while @{$self->{par}} > $max;
3166 }
2676 3167
2677 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2678 $self->update; 3169 $self->update;
2679} 3170}
2680 3171
2681sub scroll_to_bottom { 3172sub scroll_to_bottom {
2682 my ($self) = @_; 3173 my ($self) = @_;
2683 3174
2684 $self->{scroll_to_bottom} = 1; 3175 $self->{scroll_to} = $#{$self->{par}};
2685 $self->update; 3176 $self->update;
2686} 3177}
2687 3178
3179sub force_uptodate {
3180 my ($self) = @_;
3181
3182 if (delete $self->{need_reflow}) {
3183 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3184
3185 my $height = 0;
3186
3187 for my $para (@{$self->{par}}) {
3188 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3189 my $layout = $self->get_layout ($para);
3190 my ($w, $h) = $layout->size;
3191
3192 $para->{w} = $w + $para->{indent};
3193 $para->{h} = $h;
3194 $para->{wrapped} = $layout->has_wrapped;
3195 }
3196
3197 $para->{y} = $height;
3198 $height += $para->{h};
3199 }
3200
3201 $self->{height} = $height;
3202 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3203
3204 delete $self->{texture};
3205 }
3206
3207 if (my $paridx = delete $self->{scroll_to}) {
3208 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3209 }
3210}
3211
2688sub update { 3212sub update {
2689 my ($self) = @_; 3213 my ($self) = @_;
2690 3214
2691 $self->SUPER::update; 3215 $self->SUPER::update;
2692 3216
2693 return unless $self->{h} > 0; 3217 return unless $self->{h} > 0;
2694 3218
2695 delete $self->{texture}; 3219 delete $self->{texture};
2696 3220
2697 $ROOT->on_post_alloc ($self => sub { 3221 $ROOT->on_post_alloc ($self => sub {
3222 $self->force_uptodate;
3223
2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3224 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699 3225
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 { 3226 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728 glClearColor 0, 0, 0, 0; 3227 glClearColor 0, 0, 0, 0;
2729 glClear GL_COLOR_BUFFER_BIT; 3228 glClear GL_COLOR_BUFFER_BIT;
2730 3229
3230 package CFPlus::UI::Base;
3231 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3232 (0, 0, $self->{w}, $self->{h});
3233
3234 my $top = int $self->{children}[1]{range}[0];
3235
3236 my $paridx = 0;
3237 my $top_paragraph;
2731 my $top = int $self->{children}[1]{range}[0]; 3238 my $top = int $self->{children}[1]{range}[0];
2732 3239
2733 my $y0 = $top; 3240 my $y0 = $top;
2734 my $y1 = $top + $H; 3241 my $y1 = $top + $H;
2735 3242
2736 my $y = 0;
2737
2738 for my $para (@{$self->{par}}) { 3243 for my $para (@{$self->{par}}) {
2739 my $h = $para->{h}; 3244 my $h = $para->{h};
3245 my $y = $para->{y};
2740 3246
2741 if ($y0 < $y + $h && $y < $y1) { 3247 if ($y0 < $y + $h && $y < $y1) {
2742
2743 my $layout = $self->get_layout ($para); 3248 my $layout = $self->get_layout ($para);
2744 3249
2745 $layout->render ($para->{indent}, $y - $y0); 3250 $layout->render ($para->{indent}, $y - $y0);
2746 3251
2747 if (my @w = @{ $para->{widget} }) { 3252 if (my @w = @{ $para->{widget} }) {
… …
2756 $_->draw; 3261 $_->draw;
2757 } 3262 }
2758 } 3263 }
2759 } 3264 }
2760 3265
2761 $y += $h; 3266 $paridx++;
3267 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3268 }
3269
3270 $self->{top_paragraph} = $top_paragraph;
2763 }; 3271 };
2764 }); 3272 });
2765} 3273}
2766 3274
2767sub reconfigure { 3275sub reconfigure {
… …
2785 $self->{children}[1]->draw; 3293 $self->{children}[1]->draw;
2786} 3294}
2787 3295
2788############################################################################# 3296#############################################################################
2789 3297
2790package CFClient::UI::Animator; 3298package CFPlus::UI::Animator;
2791 3299
2792use CFClient::OpenGL; 3300use CFPlus::OpenGL;
2793 3301
2794our @ISA = CFClient::UI::Bin::; 3302our @ISA = CFPlus::UI::Bin::;
2795 3303
2796sub moveto { 3304sub moveto {
2797 my ($self, $x, $y) = @_; 3305 my ($self, $x, $y) = @_;
2798 3306
2799 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3307 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2827 glPopMatrix; 3335 glPopMatrix;
2828} 3336}
2829 3337
2830############################################################################# 3338#############################################################################
2831 3339
2832package CFClient::UI::Flopper; 3340package CFPlus::UI::Flopper;
2833 3341
2834our @ISA = CFClient::UI::Button::; 3342our @ISA = CFPlus::UI::Button::;
2835 3343
2836sub new { 3344sub new {
2837 my $class = shift; 3345 my $class = shift;
2838 3346
2839 my $self = $class->SUPER::new ( 3347 my $self = $class->SUPER::new (
… …
2851 $self->{other}->toggle_visibility; 3359 $self->{other}->toggle_visibility;
2852} 3360}
2853 3361
2854############################################################################# 3362#############################################################################
2855 3363
2856package CFClient::UI::Tooltip; 3364package CFPlus::UI::Tooltip;
2857 3365
2858our @ISA = CFClient::UI::Bin::; 3366our @ISA = CFPlus::UI::Bin::;
2859 3367
2860use CFClient::OpenGL; 3368use CFPlus::OpenGL;
2861 3369
2862sub new { 3370sub new {
2863 my $class = shift; 3371 my $class = shift;
2864 3372
2865 $class->SUPER::new ( 3373 $class->SUPER::new (
… …
2868 ) 3376 )
2869} 3377}
2870 3378
2871sub set_tooltip_from { 3379sub set_tooltip_from {
2872 my ($self, $widget) = @_; 3380 my ($self, $widget) = @_;
3381
3382 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3383 if $widget->{tooltip} =~ /^#(.*)$/;
2873 3384
2874 my $tooltip = $widget->{tooltip}; 3385 my $tooltip = $widget->{tooltip};
2875 3386
2876 if ($ENV{CFPLUS_DEBUG} & 2) { 3387 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n" 3388 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2881 } 3392 }
2882 3393
2883 $tooltip =~ s/^\n+//; 3394 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//; 3395 $tooltip =~ s/\n+$//;
2885 3396
2886 $self->add (new CFClient::UI::Label 3397 $self->add (new CFPlus::UI::Label
2887 markup => $tooltip, 3398 markup => $tooltip,
2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3399 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889 fontsize => 0.8, 3400 fontsize => 0.8,
2890 fg => [0, 0, 0, 1], 3401 style => 1, # FLAG_INVERSE
2891 ellipsise => 0, 3402 ellipsise => 0,
2892 font => ($widget->{tooltip_font} || $::FONT_PROP), 3403 font => ($widget->{tooltip_font} || $::FONT_PROP),
2893 ); 3404 );
2894} 3405}
2895 3406
… …
2914 3425
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3426 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3427 my $widget = $self->{owner}
2917 or return; 3428 or return;
2918 3429
3430 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3431 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3432
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3433 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3434 if $x + $self->{w} > $self->{root}{w};
2923 3435
2924 $self->move_abs ($x, $y); 3436 $self->move_abs ($x, $y);
3437 } else {
3438 $self->hide;
3439 }
2925 }); 3440 });
2926} 3441}
2927 3442
2928sub _draw { 3443sub _draw {
2929 my ($self) = @_; 3444 my ($self) = @_;
… …
2953 $self->SUPER::_draw; 3468 $self->SUPER::_draw;
2954} 3469}
2955 3470
2956############################################################################# 3471#############################################################################
2957 3472
2958package CFClient::UI::Face; 3473package CFPlus::UI::Face;
2959 3474
2960our @ISA = CFClient::UI::Base::; 3475our @ISA = CFPlus::UI::DrawBG::;
2961 3476
2962use CFClient::OpenGL; 3477use CFPlus::OpenGL;
2963 3478
2964sub new { 3479sub new {
2965 my $class = shift; 3480 my $class = shift;
2966 3481
2967 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
2968 aspect => 1, 3485 aspect => 1,
2969 can_events => 0, 3486 can_events => 0,
2970 @_, 3487 @_,
2971 ); 3488 );
2972 3489
2973 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
2974 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
2975 3492
2976 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
2977 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2978 hard => 1, 3495 hard => 1,
2979 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
2980 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
2981 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
2982 $widget->update; 3502 $self->update;
2983 }, 3503 },
2984 ); 3504 );
3505
3506 $self->update_face;
2985 } 3507 }
2986 3508
2987 $self 3509 $self
2988} 3510}
2989 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
2990sub size_request { 3525sub size_request {
2991 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
2992} 3541}
2993 3542
2994sub update { 3543sub update {
2995 my ($self) = @_; 3544 my ($self) = @_;
2996 3545
… …
3002sub _draw { 3551sub _draw {
3003 my ($self) = @_; 3552 my ($self) = @_;
3004 3553
3005 return unless $::CONN; 3554 return unless $::CONN;
3006 3555
3007 my $face; 3556 $self->SUPER::_draw;
3008 3557
3009 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3011 3559 or return;
3012 $face = $anim->[ $self->{frame} % @$anim ]
3013 if $anim && @$anim;
3014 }
3015 3560
3016 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3017 3562
3018 if ($tex) { 3563 if ($tex) {
3019 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3021 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3033 $self->SUPER::destroy; 3578 $self->SUPER::destroy;
3034} 3579}
3035 3580
3036############################################################################# 3581#############################################################################
3037 3582
3038package CFClient::UI::Buttonbar; 3583package CFPlus::UI::Buttonbar;
3039 3584
3040our @ISA = CFClient::UI::HBox::; 3585our @ISA = CFPlus::UI::HBox::;
3041 3586
3042# TODO: should actualyl wrap buttons and other goodies. 3587# TODO: should actually wrap buttons and other goodies.
3043 3588
3044############################################################################# 3589#############################################################################
3045 3590
3046package CFClient::UI::Menu; 3591package CFPlus::UI::Menu;
3047 3592
3048our @ISA = CFClient::UI::FancyFrame::; 3593our @ISA = CFPlus::UI::Toplevel::;
3049 3594
3050use CFClient::OpenGL; 3595use CFPlus::OpenGL;
3051 3596
3052sub new { 3597sub new {
3053 my $class = shift; 3598 my $class = shift;
3054 3599
3055 my $self = $class->SUPER::new ( 3600 my $self = $class->SUPER::new (
3056 items => [], 3601 items => [],
3057 z => 100, 3602 z => 100,
3058 @_, 3603 @_,
3059 ); 3604 );
3060 3605
3061 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062 3607
3063 for my $item (@{ $self->{items} }) { 3608 for my $item (@{ $self->{items} }) {
3064 my ($widget, $cb, $tooltip) = @$item; 3609 my ($widget, $cb, $tooltip) = @$item;
3065 3610
3066 # handle various types of items, only text for now 3611 # handle various types of items, only text for now
3067 if (!ref $widget) { 3612 if (!ref $widget) {
3068 if ($widget =~ /\t/) { 3613 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2; 3614 my ($left, $right) = split /\t/, $widget, 2;
3070 3615
3071 $widget = new CFClient::UI::HBox 3616 $widget = new CFPlus::UI::HBox
3072 can_hover => 1, 3617 can_hover => 1,
3073 can_events => 1, 3618 can_events => 1,
3074 tooltip => $tooltip, 3619 tooltip => $tooltip,
3075 children => [ 3620 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1), 3621 (new CFPlus::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1), 3622 (new CFPlus::UI::Label markup => $right, align => +1),
3078 ], 3623 ],
3079 ; 3624 ;
3080 3625
3081 } else { 3626 } else {
3082 $widget = new CFClient::UI::Label 3627 $widget = new CFPlus::UI::Label
3083 can_hover => 1, 3628 can_hover => 1,
3084 can_events => 1, 3629 can_events => 1,
3085 markup => $widget, 3630 markup => $widget,
3086 tooltip => $tooltip; 3631 tooltip => $tooltip;
3087 } 3632 }
… …
3135 1 3680 1
3136} 3681}
3137 3682
3138############################################################################# 3683#############################################################################
3139 3684
3140package CFClient::UI::Multiplexer; 3685package CFPlus::UI::Multiplexer;
3141 3686
3142our @ISA = CFClient::UI::Container::; 3687our @ISA = CFPlus::UI::Container::;
3143 3688
3144sub new { 3689sub new {
3145 my $class = shift; 3690 my $class = shift;
3146 3691
3147 my $self = $class->SUPER::new ( 3692 my $self = $class->SUPER::new (
… …
3208 $self->{current}->draw; 3753 $self->{current}->draw;
3209} 3754}
3210 3755
3211############################################################################# 3756#############################################################################
3212 3757
3213package CFClient::UI::Notebook; 3758package CFPlus::UI::Notebook;
3214 3759
3215our @ISA = CFClient::UI::VBox::; 3760our @ISA = CFPlus::UI::VBox::;
3216 3761
3217sub new { 3762sub new {
3218 my $class = shift; 3763 my $class = shift;
3219 3764
3220 my $self = $class->SUPER::new ( 3765 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar), 3766 buttonbar => (new CFPlus::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3767 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self 3768 # filter => # will be put between multiplexer and $self
3224 @_, 3769 @_,
3225 ); 3770 );
3226 3771
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3772 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3231} 3776}
3232 3777
3233sub add { 3778sub add {
3234 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3235 3780
3236 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3237 3782
3238 $self->{buttonbar}->add (new CFClient::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3239 markup => $title, 3784 markup => $title,
3240 tooltip => $tooltip, 3785 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
3242 ); 3787 );
3243 3788
… …
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 3802 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 3803}
3259 3804
3260############################################################################# 3805#############################################################################
3261 3806
3262package CFClient::UI::Combobox; 3807package CFPlus::UI::Selector;
3263 3808
3264use utf8; 3809use utf8;
3265 3810
3266our @ISA = CFClient::UI::Button::; 3811our @ISA = CFPlus::UI::Button::;
3267 3812
3268sub new { 3813sub new {
3269 my $class = shift; 3814 my $class = shift;
3270 3815
3271 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
… …
3288 my ($value, $title, $tooltip) = @$_; 3833 my ($value, $title, $tooltip) = @$_;
3289 3834
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3835 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 } 3836 }
3292 3837
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3838 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294} 3839}
3295 3840
3296sub _set_value { 3841sub _set_value {
3297 my ($self, $value) = @_; 3842 my ($self, $value) = @_;
3298 3843
… …
3313 $self->emit (changed => $value); 3858 $self->emit (changed => $value);
3314} 3859}
3315 3860
3316############################################################################# 3861#############################################################################
3317 3862
3318package CFClient::UI::Statusbox; 3863package CFPlus::UI::Statusbox;
3319 3864
3320our @ISA = CFClient::UI::VBox::; 3865our @ISA = CFPlus::UI::VBox::;
3321 3866
3322sub new { 3867sub new {
3323 my $class = shift; 3868 my $class = shift;
3324 3869
3325 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3326 fontsize => 0.8, 3871 fontsize => 0.8,
3327 @_, 3872 @_,
3328 ); 3873 );
3329 3874
3330 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3331 3876
3332 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3877 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333 3878
3334 $self 3879 $self
3335} 3880}
… …
3337sub reorder { 3882sub reorder {
3338 my ($self) = @_; 3883 my ($self) = @_;
3339 my $NOW = Time::HiRes::time; 3884 my $NOW = Time::HiRes::time;
3340 3885
3341 # freeze display when hovering over any label 3886 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner} 3887 return if $CFPlus::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3888 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} }; 3889 values %{ $self->{item} };
3345 3890
3346 while (my ($k, $v) = each %{ $self->{item} }) { 3891 while (my ($k, $v) = each %{ $self->{item} }) {
3347 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3892 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348 } 3893 }
… …
3369 for ($short) { 3914 for ($short) {
3370 s/^\s+//; 3915 s/^\s+//;
3371 s/\s+/ /g; 3916 s/\s+/ /g;
3372 } 3917 }
3373 3918
3374 new CFClient::UI::Label 3919 new CFPlus::UI::Label
3375 markup => $short, 3920 markup => $short,
3376 tooltip => $item->{tooltip}, 3921 tooltip => $item->{tooltip},
3377 tooltip_font => $::FONT_PROP, 3922 tooltip_font => $::FONT_PROP,
3378 tooltip_width => 0.67, 3923 tooltip_width => 0.67,
3379 fontsize => $item->{fontsize} || $self->{fontsize}, 3924 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3458 $self->SUPER::destroy; 4003 $self->SUPER::destroy;
3459} 4004}
3460 4005
3461############################################################################# 4006#############################################################################
3462 4007
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; 4008package CFPlus::UI::Root;
3628 4009
3629our @ISA = CFClient::UI::Container::; 4010our @ISA = CFPlus::UI::Container::;
3630 4011
3631use List::Util qw(min max); 4012use List::Util qw(min max);
3632 4013
3633use CFClient::OpenGL; 4014use CFPlus::OpenGL;
3634 4015
3635sub new { 4016sub new {
3636 my $class = shift; 4017 my $class = shift;
3637 4018
3638 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3639 visible => 1, 4020 visible => 1,
3640 @_, 4021 @_,
3641 ); 4022 );
3642 4023
3643 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3644 4025
3645 $self 4026 $self
3646} 4027}
3647 4028
3648sub size_request { 4029sub size_request {
… …
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4195 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 4196
3816 $w = 0 if $w < 0; 4197 $w = 0 if $w < 0;
3817 $h = 0 if $h < 0; 4198 $h = 0 if $h < 0;
3818 4199
4200 $w = max $widget->{min_w}, $w;
4201 $h = max $widget->{min_h}, $h;
4202
4203# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4204# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4205
4206 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4207 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4208
3819 $w = int $w + 0.5; 4209 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 4210 $h = int $h + 0.5;
3821 4211
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4212 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 4213 $widget->{old_w} = $widget->{w};
… …
3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4236 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847 glMatrixMode GL_MODELVIEW; 4237 glMatrixMode GL_MODELVIEW;
3848 glLoadIdentity; 4238 glLoadIdentity;
3849 4239
3850 { 4240 {
3851 package CFClient::UI::Base; 4241 package CFPlus::UI::Base;
3852 4242
3853 ($draw_x, $draw_y, $draw_w, $draw_h) = 4243 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h}); 4244 (0, 0, $self->{w}, $self->{h});
3855 }
3856 4245
3857 $self->_draw; 4246 $self->_draw;
4247 }
3858} 4248}
3859 4249
3860############################################################################# 4250#############################################################################
3861 4251
3862package CFClient::UI; 4252package CFPlus::UI;
3863 4253
3864$ROOT = new CFClient::UI::Root; 4254$ROOT = new CFPlus::UI::Root;
3865$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4255$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866 4256
38671 42571
3868 4258

Diff Legend

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