ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
… …
452 486
453 $FOCUS->emit ("focus_out") if $FOCUS; 487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
593
594 delete $WIDGET{$self+0};
595 661
596 eval { $self->destroy }; 662 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
598} 666}
599 667
600############################################################################# 668#############################################################################
601 669
602package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
603 671
604our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
605 673
606use strict; 674use strict;
607use CFClient::OpenGL; 675use CFPlus::OpenGL;
608 676
609sub new { 677sub new {
610 my $class = shift; 678 my $class = shift;
611 679
612 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
643 } 711 }
644} 712}
645 713
646############################################################################# 714#############################################################################
647 715
648package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
649 717
650our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
651 719
652sub new { 720sub new {
653 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
655} 723}
… …
662 730
663sub draw { } 731sub draw { }
664 732
665############################################################################# 733#############################################################################
666 734
667package CFClient::UI::Container; 735package CFPlus::UI::Container;
668 736
669our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
670 738
671sub new { 739sub new {
672 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
673 741
674 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
683 if $children; 751 if $children;
684 752
685 $self 753 $self
686} 754}
687 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
688sub add { 764sub add {
689 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
690 766
691 $_->set_parent ($self) 767 $_->set_parent ($self)
692 for @widgets; 768 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
753} 829}
754 830
755############################################################################# 831#############################################################################
756 832
757package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
758 834
759our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
760 836
761sub new { 837sub new {
762 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
763 839
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 841
766 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
767} 843}
768 844
769sub add { 845sub add {
… …
776sub remove { 852sub remove {
777 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
778 854
779 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
780 856
781 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 858 unless @{$self->{children}};
783} 859}
784 860
785sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
786 862
… …
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
949use List::Util qw(min max);
950
875our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
876 952
877sub new { 953sub new {
878 my $class = shift; 954 my $class = shift;
879 955
880 $class->SUPER::new ( 956 $class->SUPER::new (
… …
910} 986}
911 987
912sub set_offset { 988sub set_offset {
913 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
914 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
917 997
998 $self->emit (changed => $x, $y);
918 $self->update; 999 $self->update;
1000 }
919} 1001}
920 1002
921# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 1004sub coord2local {
923 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1024 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1026 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1028 }
947} 1029}
948 1030
949sub _render { 1031sub _render {
950 my ($self) = @_; 1032 my ($self) = @_;
951 1033
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1036
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1038
957 $self->SUPER::_render; 1039 $self->SUPER::_render;
958} 1040}
959 1041
960############################################################################# 1042#############################################################################
961 1043
962package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
963 1045
964our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
965 1047
966sub new { 1048sub new {
967 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
968 1050
969 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
970 1052
971 my $self; 1053 my $self;
972 1054
973 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
974 vertical => 1, 1065 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1067 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1070 },
979 ; 1071 ;
980 1072
981 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
983 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
984 %arg, 1081 %arg,
985 ); 1082 );
986 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
988 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
989 1101
990 $self 1102 $self
991} 1103}
992 1104
… …
999} 1111}
1000 1112
1001sub update_slider { 1113sub update_slider {
1002 my ($self) = @_; 1114 my ($self) = @_;
1003 1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1005} 1135}
1006 1136
1007sub update { 1137sub update {
1008 my ($self) = @_; 1138 my ($self) = @_;
1009 1139
1010 $self->SUPER::update; 1140 $self->SUPER::update;
1011
1012 $self->update_slider; 1141 $self->update_slider;
1142}
1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1013} 1195}
1014 1196
1015sub invoke_size_allocate { 1197sub invoke_size_allocate {
1016 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1017 1199
1018 $self->update_slider; 1200 $self->update_slider;
1019
1020 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1021} 1202}
1022 1203
1023############################################################################# 1204#############################################################################
1024 1205
1025package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1026 1207
1027our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1028 1209
1029use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1030 1211
1031sub new { 1212sub new {
1032 my $class = shift; 1213 my $class = shift;
1033 1214
1034 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1060 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1061} 1242}
1062 1243
1063############################################################################# 1244#############################################################################
1064 1245
1065package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1066 1247
1067our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1068 1249
1069use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1070 1351
1071my $bg = 1352my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1074 1355
1075my @border = 1356my @border =
1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1078 1363
1079sub new { 1364sub new {
1080 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1081 1366
1082 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1087 min_w => 64, 1372 min_w => 64,
1088 min_h => 32, 1373 min_h => 32,
1089 %arg, 1374 %arg,
1090 ); 1375 );
1091 1376
1092 $self->{title_widget} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1093 align => 0, 1378 align => 0,
1094 valign => 1, 1379 valign => 1,
1095 text => $self->{title}, 1380 text => $self->{title},
1096 fontsize => $self->{border}, 1381 fontsize => $self->{border},
1097 if exists $self->{title}; 1382 if exists $self->{title};
1098 1383
1099 if ($self->{has_close_button}) { 1384 if ($self->{has_close_button}) {
1100 $self->{close_button} = 1385 $self->{close_button} =
1101 new CFClient::UI::ImageButton 1386 new CFPlus::UI::ImageButton
1102 path => 'x1_close.png', 1387 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") }; 1388 on_activate => sub { $self->emit ("delete") };
1104 1389
1105 $self->CFClient::UI::Container::add ($self->{close_button}); 1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1106 } 1391 }
1107 1392
1108 $self 1393 $self
1109} 1394}
1110 1395
1111sub add { 1396sub add {
1112 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1113 1398
1114 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117} 1402}
1118 1403
1119sub border { 1404sub border {
1120 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1121} 1406}
… …
1229 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230 1515
1231 ! ! $self->{motion} 1516 ! ! $self->{motion}
1232} 1517}
1233 1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1525}
1526
1234sub _draw { 1527sub _draw {
1235 my ($self) = @_; 1528 my ($self) = @_;
1236 1529
1237 my $child = $self->{children}[0]; 1530 my $child = $self->{children}[0];
1238 1531
… …
1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1244 1537
1245 my $border = $self->border; 1538 my $border = $self->border;
1246 1539
1247 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1248 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1249 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1250 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1251 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1252 1559
1253 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1254 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1255 1562
1256 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1275 if $self->{close_button}; 1582 if $self->{close_button};
1276} 1583}
1277 1584
1278############################################################################# 1585#############################################################################
1279 1586
1280package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1281 1588
1282our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1283 1590
1284use List::Util qw(max sum); 1591use List::Util qw(max sum);
1285 1592
1286use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1287 1594
1288sub new { 1595sub new {
1289 my $class = shift; 1596 my $class = shift;
1290 1597
1291 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1292 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1293 @_, 1602 @_,
1294 ) 1603 )
1295} 1604}
1296 1605
1297sub children { 1606sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299} 1608}
1300 1609
1610# TODO: store row/col info in child widget and use standard add/del
1301sub add { 1611sub add {
1302 my ($self, $x, $y, $child) = @_; 1612 my ($self) = shift;
1303 1613
1614 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1304 $child->set_parent ($self); 1616 $child->set_parent ($self);
1305 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1618 }
1306 1619
1620 $self->{force_realloc} = 1;
1621 $self->{force_size_alloc} = 1;
1307 $self->realloc; 1622 $self->realloc;
1308} 1623}
1309 1624
1310sub remove { 1625sub remove {
1311 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1312 1627
1313 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1314} 1633}
1315 1634
1316# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1317sub clear { 1636sub clear {
1318 my ($self) = @_; 1637 my ($self) = @_;
… …
1367 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1368 1687
1369 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1370 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1371 1690
1372 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1373 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1374 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1375 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1376 1695
1377 # linearly scale sizes
1378 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380 1697
1381 CFClient::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1382 CFClient::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1383 1707
1384 my $y; 1708 my $y;
1385 1709
1386 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
1387 my $row = $self->{children}[$r] 1711 my $row = $self->{children}[$r]
… …
1430 } 1754 }
1431} 1755}
1432 1756
1433############################################################################# 1757#############################################################################
1434 1758
1435package CFClient::UI::Box; 1759package CFPlus::UI::Fixed;
1436 1760
1761use List::Util qw(min max);
1762
1437our @ISA = CFClient::UI::Container::; 1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1837}
1838
1839#############################################################################
1840
1841package CFPlus::UI::Box;
1842
1843our @ISA = CFPlus::UI::Container::;
1438 1844
1439sub size_request { 1845sub size_request {
1440 my ($self) = @_; 1846 my ($self) = @_;
1441 1847
1442 $self->{vertical} 1848 $self->{vertical}
… …
1475 $req[$_] += $space * $children[$_]{expand} 1881 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children; 1882 for 0 .. $#children;
1477 } 1883 }
1478 } 1884 }
1479 1885
1480 CFClient::UI::harmonize \@req; 1886 CFPlus::UI::harmonize \@req;
1481 1887
1482 my $pos = 0; 1888 my $pos = 0;
1483 for (0 .. $#children) { 1889 for (0 .. $#children) {
1484 my $alloc = $req[$_]; 1890 my $alloc = $req[$_];
1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1891 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1490 1 1896 1
1491} 1897}
1492 1898
1493############################################################################# 1899#############################################################################
1494 1900
1495package CFClient::UI::HBox; 1901package CFPlus::UI::HBox;
1496 1902
1497our @ISA = CFClient::UI::Box::; 1903our @ISA = CFPlus::UI::Box::;
1498 1904
1499sub new { 1905sub new {
1500 my $class = shift; 1906 my $class = shift;
1501 1907
1502 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1505 ) 1911 )
1506} 1912}
1507 1913
1508############################################################################# 1914#############################################################################
1509 1915
1510package CFClient::UI::VBox; 1916package CFPlus::UI::VBox;
1511 1917
1512our @ISA = CFClient::UI::Box::; 1918our @ISA = CFPlus::UI::Box::;
1513 1919
1514sub new { 1920sub new {
1515 my $class = shift; 1921 my $class = shift;
1516 1922
1517 $class->SUPER::new ( 1923 $class->SUPER::new (
… …
1520 ) 1926 )
1521} 1927}
1522 1928
1523############################################################################# 1929#############################################################################
1524 1930
1525package CFClient::UI::Label; 1931package CFPlus::UI::Label;
1526 1932
1527our @ISA = CFClient::UI::DrawBG::; 1933our @ISA = CFPlus::UI::DrawBG::;
1528 1934
1529use CFClient::OpenGL; 1935use CFPlus::OpenGL;
1530 1936
1531sub new { 1937sub new {
1532 my ($class, %arg) = @_; 1938 my ($class, %arg) = @_;
1533 1939
1534 my $self = $class->SUPER::new ( 1940 my $self = $class->SUPER::new (
… …
1537 #active_bg => none 1943 #active_bg => none
1538 #font => default_font 1944 #font => default_font
1539 #text => initial text 1945 #text => initial text
1540 #markup => initial narkup 1946 #markup => initial narkup
1541 #max_w => maximum pixel width 1947 #max_w => maximum pixel width
1948 #style => 0, # render flags
1542 ellipsise => 3, # end 1949 ellipsise => 3, # end
1543 layout => (new CFClient::Layout), 1950 layout => (new CFPlus::Layout),
1544 fontsize => 1, 1951 fontsize => 1,
1545 align => -1, 1952 align => -1,
1546 valign => -1, 1953 valign => -1,
1547 padding_x => 2, 1954 padding_x => 2,
1548 padding_y => 2, 1955 padding_y => 2,
1549 can_events => 0, 1956 can_events => 0,
1550 %arg 1957 %arg
1551 ); 1958 );
1552 1959
1553 if (exists $self->{template}) { 1960 if (exists $self->{template}) {
1554 my $layout = new CFClient::Layout; 1961 my $layout = new CFPlus::Layout;
1555 $layout->set_text (delete $self->{template}); 1962 $layout->set_text (delete $self->{template});
1556 $self->{template} = $layout; 1963 $self->{template} = $layout;
1557 } 1964 }
1558 1965
1559 if (exists $self->{markup}) { 1966 if (exists $self->{markup}) {
… …
1561 } else { 1968 } else {
1562 $self->set_text (delete $self->{text}); 1969 $self->set_text (delete $self->{text});
1563 } 1970 }
1564 1971
1565 $self 1972 $self
1566}
1567
1568sub escape($) {
1569 local $_ = $_[0];
1570
1571 s/&/&amp;/g;
1572 s/>/&gt;/g;
1573 s/</&lt;/g;
1574
1575 $_
1576} 1973}
1577 1974
1578sub update { 1975sub update {
1579 my ($self) = @_; 1976 my ($self) = @_;
1580 1977
… …
1707 }; 2104 };
1708 2105
1709 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2106 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2107 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2108
1712 $self->{layout}->render ($self->{ox}, $self->{oy}); 2109 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2110}
1714 2111
1715############################################################################# 2112#############################################################################
1716 2113
1717package CFClient::UI::EntryBase; 2114package CFPlus::UI::EntryBase;
1718 2115
1719our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1720 2117
1721use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1722 2119
1723sub new { 2120sub new {
1724 my $class = shift; 2121 my $class = shift;
1725 2122
1726 $class->SUPER::new ( 2123 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2127 active_fg => [0, 0, 0],
1731 can_hover => 1, 2128 can_hover => 1,
1732 can_focus => 1, 2129 can_focus => 1,
1733 valign => 0, 2130 valign => 0,
1734 can_events => 1, 2131 can_events => 1,
2132 ellipsise => 0,
1735 #text => ... 2133 #text => ...
1736 #hidden => "*", 2134 #hidden => "*",
1737 @_ 2135 @_
1738 ) 2136 )
1739} 2137}
… …
1784 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1786 2184
1787 my $text = $self->get_text; 2185 my $text = $self->get_text;
1788 2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2188
1789 if ($uni == 8) { 2189 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2193 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2194 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2195 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2196 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2197 } elsif ($sym == CFPlus::SDLK_HOME) {
2198 # what a hack
2199 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1
2202 : 0;
2203 } elsif ($sym == CFPlus::SDLK_END) {
2204 # uh, again
2205 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2207 ? $self->{cursor} + length $1
2208 : length $self->{text};
2209 } elsif ($uni == 21) { # ctrl-u
2210 $text = "";
1798 $self->{cursor} = 0; 2211 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2212 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2213 $self->emit ('escape');
1803 } elsif ($uni) { 2214 } elsif ($uni == 0x0d) {
2215 substr $text, $self->{cursor}++, 0, "\012";
2216 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2217 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2218 } else {
1806 return 0; 2219 return 0;
1807 } 2220 }
1808 2221
1809 $self->_set_text ($text); 2222 $self->_set_text ($text);
1810 2223
1811 $self->realloc; 2224 $self->realloc;
2225 $self->update;
1812 2226
1813 1 2227 1
1814} 2228}
1815 2229
1816sub invoke_focus_in { 2230sub invoke_focus_in {
… …
1878 utf8::encode $text; 2292 utf8::encode $text;
1879 2293
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2294 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2295 }
1882 2296
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2297 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2299 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2300 glEnd;
1888 } 2301 }
1889} 2302}
1890 2303
2304#############################################################################
2305
1891package CFClient::UI::Entry; 2306package CFPlus::UI::Entry;
1892 2307
1893our @ISA = CFClient::UI::EntryBase::; 2308our @ISA = CFPlus::UI::EntryBase::;
1894 2309
1895use CFClient::OpenGL; 2310use CFPlus::OpenGL;
1896 2311
1897sub invoke_key_down { 2312sub invoke_key_down {
1898 my ($self, $ev) = @_; 2313 my ($self, $ev) = @_;
1899 2314
1900 my $sym = $ev->{sym}; 2315 my $sym = $ev->{sym};
1901 2316
1902 if ($sym == 13) { 2317 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2318 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2319 my $txt = $self->get_text;
1905 2320
1906 $self->{history_pointer} = -1; 2321 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2322 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2323 $self->emit (activate => $txt);
1909 $self->update; 2324 $self->update;
1910 2325
1911 } elsif ($sym == CFClient::SDLK_UP) { 2326 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2327 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2328 $self->{history_saveback} = $self->get_text;
1914 } 2329 }
1915 if (@{$self->{history} || []} > 0) { 2330 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2331 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2333 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2334 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2335 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2336 }
1922 2337
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2339 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2340 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2341
1927 if ($self->{history_pointer} >= 0) { 2342 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2352 1
1938} 2353}
1939 2354
1940############################################################################# 2355#############################################################################
1941 2356
2357package CFPlus::UI::TextEdit;
2358
2359our @ISA = CFPlus::UI::EntryBase::;
2360
2361use CFPlus::OpenGL;
2362
2363sub move_cursor_ver {
2364 my ($self, $dy) = @_;
2365
2366 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2367
2368 $y += $dy;
2369
2370 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2371 $self->{cursor} = $index;
2372 delete $self->{cur_h};
2373 $self->update;
2374 return;
2375 }
2376}
2377
2378sub invoke_key_down {
2379 my ($self, $ev) = @_;
2380
2381 my $sym = $ev->{sym};
2382
2383 if ($sym == CFPlus::SDLK_UP) {
2384 $self->move_cursor_ver (-1);
2385 } elsif ($sym == CFPlus::SDLK_DOWN) {
2386 $self->move_cursor_ver (+1);
2387 } else {
2388 return $self->SUPER::invoke_key_down ($ev)
2389 }
2390
2391 1
2392}
2393
2394#############################################################################
2395
1942package CFClient::UI::Button; 2396package CFPlus::UI::Button;
1943 2397
1944our @ISA = CFClient::UI::Label::; 2398our @ISA = CFPlus::UI::Label::;
1945 2399
1946use CFClient::OpenGL; 2400use CFPlus::OpenGL;
1947 2401
1948my @tex = 2402my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
1951 2405
1952sub new { 2406sub new {
1953 my $class = shift; 2407 my $class = shift;
1954 2408
1955 $class->SUPER::new ( 2409 $class->SUPER::new (
1956 padding_x => 4, 2410 padding_x => 4,
1957 padding_y => 4, 2411 padding_y => 4,
1958 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2414 can_hover => 1,
1961 align => 0, 2415 align => 0,
1962 valign => 0, 2416 valign => 0,
1963 can_events => 1, 2417 can_events => 1,
1964 @_ 2418 @_
… …
1982 2436
1983 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
1986 2440
2441 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2443
1989 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
1990 2445
1991 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
1992} 2447}
1993 2448
1994############################################################################# 2449#############################################################################
1995 2450
2451package CFPlus::UI::CheckBox;
2452
2453our @ISA = CFPlus::UI::DrawBG::;
2454
2455my @tex =
2456 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2457 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2458
2459use CFPlus::OpenGL;
2460
2461sub new {
2462 my $class = shift;
2463
2464 $class->SUPER::new (
2465 padding_x => 2,
2466 padding_y => 2,
2467 fg => [1, 1, 1],
2468 active_fg => [1, 1, 0],
2469 bg => [0, 0, 0, 0.2],
2470 active_bg => [1, 1, 1, 0.5],
2471 state => 0,
2472 can_hover => 1,
2473 @_
2474 )
2475}
2476
2477sub size_request {
2478 my ($self) = @_;
2479
2480 (6) x 2
2481}
2482
2483sub toggle {
2484 my ($self) = @_;
2485
2486 $self->{state} = !$self->{state};
2487 $self->emit (changed => $self->{state});
2488 $self->update;
2489}
2490
2491sub invoke_button_down {
2492 my ($self, $ev, $x, $y) = @_;
2493
2494 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2495 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2496 $self->toggle;
2497 } else {
2498 return 0
2499 }
2500
2501 1
2502}
2503
2504sub _draw {
2505 my ($self) = @_;
2506
2507 $self->SUPER::_draw;
2508
2509 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2510
2511 my ($w, $h) = @$self{qw(w h)};
2512
2513 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2514
2515 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2516
2517 my $tex = $self->{state} ? $tex[1] : $tex[0];
2518
2519 glEnable GL_TEXTURE_2D;
2520 $tex->draw_quad_alpha (0, 0, $s, $s);
2521 glDisable GL_TEXTURE_2D;
2522}
2523
2524#############################################################################
2525
2526package CFPlus::UI::Image;
2527
2528our @ISA = CFPlus::UI::Base::;
2529
2530use CFPlus::OpenGL;
2531
2532our %texture_cache;
2533
2534sub new {
2535 my $class = shift;
2536
2537 my $self = $class->SUPER::new (
2538 can_events => 0,
2539 @_,
2540 );
2541
2542 $self->{path} || $self->{tex}
2543 or Carp::croak "'path' or 'tex' attributes required";
2544
2545 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2547
2548 CFPlus::weaken $texture_cache{$self->{path}};
2549
2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2551
2552 $self
2553}
2554
2555sub STORABLE_freeze {
2556 my ($self, $cloning) = @_;
2557
2558 $self->{path}
2559 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2560
2561 $self->{path}
2562}
2563
2564sub STORABLE_attach {
2565 my ($self, $cloning, $path) = @_;
2566
2567 $self->new (path => $path)
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572
2573 ($self->{tex}{w}, $self->{tex}{h})
2574}
2575
2576sub _draw {
2577 my ($self) = @_;
2578
2579 my $tex = $self->{tex};
2580
2581 my ($w, $h) = ($self->{w}, $self->{h});
2582
2583 if ($self->{rot90}) {
2584 glRotate 90, 0, 0, 1;
2585 glTranslate 0, -$self->{w}, 0;
2586
2587 ($w, $h) = ($h, $w);
2588 }
2589
2590 glEnable GL_TEXTURE_2D;
2591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2592
2593 $tex->draw_quad (0, 0, $w, $h);
2594
2595 glDisable GL_TEXTURE_2D;
2596}
2597
2598#############################################################################
2599
1996package CFClient::UI::ImageButton; 2600package CFPlus::UI::ImageButton;
1997 2601
1998our @ISA = CFClient::UI::Image::; 2602our @ISA = CFPlus::UI::Image::;
1999 2603
2000use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2001 2605
2002my %textures; 2606my %textures;
2003 2607
2004sub new { 2608sub new {
2005 my $class = shift; 2609 my $class = shift;
… …
2027 1 2631 1
2028} 2632}
2029 2633
2030############################################################################# 2634#############################################################################
2031 2635
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2072sub invoke_button_down {
2073 my ($self, $ev, $x, $y) = @_;
2074
2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077 $self->toggle;
2078 } else {
2079 return 0
2080 }
2081
2082 1
2083}
2084
2085sub _draw {
2086 my ($self) = @_;
2087
2088 $self->SUPER::_draw;
2089
2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100 glEnable GL_TEXTURE_2D;
2101 $tex->draw_quad_alpha (0, 0, $s, $s);
2102 glDisable GL_TEXTURE_2D;
2103}
2104
2105#############################################################################
2106
2107package CFClient::UI::Image; 2636package CFPlus::UI::VGauge;
2108 2637
2109our @ISA = CFClient::UI::Base::; 2638our @ISA = CFPlus::UI::Base::;
2110
2111use CFClient::OpenGL;
2112
2113our %texture_cache;
2114
2115sub new {
2116 my $class = shift;
2117
2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2122
2123 $self->{path} || $self->{tex}
2124 or Carp::croak "'path' or 'tex' attributes required";
2125
2126 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133 $self
2134}
2135
2136sub size_request {
2137 my ($self) = @_;
2138
2139 ($self->{tex}{w}, $self->{tex}{h})
2140}
2141
2142sub _draw {
2143 my ($self) = @_;
2144
2145 my $tex = $self->{tex};
2146
2147 my ($w, $h) = ($self->{w}, $self->{h});
2148
2149 if ($self->{rot90}) {
2150 glRotate 90, 0, 0, 1;
2151 glTranslate 0, -$self->{w}, 0;
2152
2153 ($w, $h) = ($h, $w);
2154 }
2155
2156 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159 $tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161 glDisable GL_TEXTURE_2D;
2162}
2163
2164#############################################################################
2165
2166package CFClient::UI::VGauge;
2167
2168our @ISA = CFClient::UI::Base::;
2169 2639
2170use List::Util qw(min max); 2640use List::Util qw(min max);
2171 2641
2172use CFClient::OpenGL; 2642use CFPlus::OpenGL;
2173 2643
2174my %tex = ( 2644my %tex = (
2175 food => [ 2645 food => [
2176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2647 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178 ], 2648 ],
2179 grace => [ 2649 grace => [
2180 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2650 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2651 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182 ], 2652 ],
2183 hp => [ 2653 hp => [
2184 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2655 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186 ], 2656 ],
2187 mana => [ 2657 mana => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2659 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190 ], 2660 ],
2191); 2661);
2192 2662
2193# eg. VGauge->new (gauge => 'food'), default gauge: food 2663# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2296 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2297} 2767}
2298 2768
2299############################################################################# 2769#############################################################################
2300 2770
2301package CFClient::UI::Gauge; 2771package CFPlus::UI::Gauge;
2302 2772
2303our @ISA = CFClient::UI::VBox::; 2773our @ISA = CFPlus::UI::VBox::;
2304 2774
2305sub new { 2775sub new {
2306 my ($class, %arg) = @_; 2776 my ($class, %arg) = @_;
2307 2777
2308 my $self = $class->SUPER::new ( 2778 my $self = $class->SUPER::new (
… …
2310 can_hover => 1, 2780 can_hover => 1,
2311 can_events => 1, 2781 can_events => 1,
2312 %arg, 2782 %arg,
2313 ); 2783 );
2314 2784
2315 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2785 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2786 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2787 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318 2788
2319 $self 2789 $self
2320} 2790}
2321 2791
2322sub set_fontsize { 2792sub set_fontsize {
… …
2343 $self->{value}->set_text ($val); 2813 $self->{value}->set_text ($val);
2344} 2814}
2345 2815
2346############################################################################# 2816#############################################################################
2347 2817
2348package CFClient::UI::Slider; 2818package CFPlus::UI::Slider;
2349 2819
2350use strict; 2820use strict;
2351 2821
2352use CFClient::OpenGL; 2822use CFPlus::OpenGL;
2353 2823
2354our @ISA = CFClient::UI::DrawBG::; 2824our @ISA = CFPlus::UI::DrawBG::;
2355 2825
2356my @tex = 2826my @tex =
2357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2827 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358 qw(s1_slider.png s1_slider_bg.png); 2828 qw(s1_slider.png s1_slider_bg.png);
2359 2829
2360sub new { 2830sub new {
2361 my $class = shift; 2831 my $class = shift;
2362 2832
… …
2451 } 2921 }
2452 2922
2453 1 2923 1
2454} 2924}
2455 2925
2926sub invoke_mouse_wheel {
2927 my ($self, $ev) = @_;
2928
2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2930
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932
2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2934
2935 ! ! $delta
2936}
2937
2456sub update { 2938sub update {
2457 my ($self) = @_; 2939 my ($self) = @_;
2458 2940
2459 delete $self->{knob_w}; 2941 delete $self->{knob_w};
2460 $self->SUPER::update; 2942 $self->SUPER::update;
… …
2507 glDisable GL_TEXTURE_2D; 2989 glDisable GL_TEXTURE_2D;
2508} 2990}
2509 2991
2510############################################################################# 2992#############################################################################
2511 2993
2512package CFClient::UI::ValSlider; 2994package CFPlus::UI::ValSlider;
2513 2995
2514our @ISA = CFClient::UI::HBox::; 2996our @ISA = CFPlus::UI::HBox::;
2515 2997
2516sub new { 2998sub new {
2517 my ($class, %arg) = @_; 2999 my ($class, %arg) = @_;
2518 3000
2519 my $range = delete $arg{range}; 3001 my $range = delete $arg{range};
2520 3002
2521 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
2522 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3004 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3005 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524 to_value => sub { shift }, 3006 to_value => sub { shift },
2525 from_value => sub { shift }, 3007 from_value => sub { shift },
2526 %arg, 3008 %arg,
2527 ); 3009 );
2528 3010
… …
2548sub set_range { shift->{slider}->set_range (@_) } 3030sub set_range { shift->{slider}->set_range (@_) }
2549sub set_value { shift->{slider}->set_value (@_) } 3031sub set_value { shift->{slider}->set_value (@_) }
2550 3032
2551############################################################################# 3033#############################################################################
2552 3034
2553package CFClient::UI::TextScroller; 3035package CFPlus::UI::TextScroller;
2554 3036
2555our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFPlus::UI::HBox::;
2556 3038
2557use CFClient::OpenGL; 3039use CFPlus::OpenGL;
2558 3040
2559sub new { 3041sub new {
2560 my $class = shift; 3042 my $class = shift;
2561 3043
2562 my $self = $class->SUPER::new ( 3044 my $self = $class->SUPER::new (
2563 fontsize => 1, 3045 fontsize => 1,
2564 can_events => 0, 3046 can_events => 1,
2565 indent => 0, 3047 indent => 0,
2566 #font => default_font 3048 #font => default_font
2567 @_, 3049 @_,
2568 3050
2569 layout => (new CFClient::Layout), 3051 layout => (new CFPlus::Layout),
2570 par => [], 3052 par => [],
3053 max_par => 0,
2571 height => 0, 3054 height => 0,
2572 children => [ 3055 children => [
2573 (new CFClient::UI::Empty expand => 1), 3056 (new CFPlus::UI::Empty expand => 1),
2574 (new CFClient::UI::Slider vertical => 1), 3057 (new CFPlus::UI::Slider vertical => 1),
2575 ], 3058 ],
2576 ); 3059 );
2577 3060
2578 $self->{children}[1]->connect (changed => sub { $self->update }); 3061 $self->{children}[1]->connect (changed => sub { $self->update });
2579 3062
… …
2609 3092
2610 $self->reflow; 3093 $self->reflow;
2611 3094
2612 local $self->{children} = [$empty, $slider]; 3095 local $self->{children} = [$empty, $slider];
2613 $self->SUPER::invoke_size_allocate ($w, $h) 3096 $self->SUPER::invoke_size_allocate ($w, $h)
3097}
3098
3099sub invoke_mouse_wheel {
3100 my ($self, $ev) = @_;
3101
3102 return 0 unless $ev->{dy}; # only vertical movements
3103
3104 $self->{children}[1]->emit (mouse_wheel => $ev);
3105
3106 1
2614} 3107}
2615 3108
2616sub get_layout { 3109sub get_layout {
2617 my ($self, $para) = @_; 3110 my ($self, $para) = @_;
2618 3111
… …
2646 3139
2647 # todo: base offset on lines or so, not on pixels 3140 # todo: base offset on lines or so, not on pixels
2648 $self->{children}[1]->set_value ($offset); 3141 $self->{children}[1]->set_value ($offset);
2649} 3142}
2650 3143
3144sub current_paragraph {
3145 my ($self) = @_;
3146
3147 $self->{top_paragraph} - 1
3148}
3149
3150sub scroll_to {
3151 my ($self, $para) = @_;
3152
3153 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3154
3155 $self->{scroll_to} = $para;
3156 $self->update;
3157}
3158
2651sub clear { 3159sub clear {
2652 my ($self) = @_; 3160 my ($self) = @_;
2653 3161
2654 my (undef, undef, @other) = @{ $self->{children} }; 3162 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other; 3163 $self->remove ($_) for @other;
… …
2658 $self->{height} = 0; 3166 $self->{height} = 0;
2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3167 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660} 3168}
2661 3169
2662sub add_paragraph { 3170sub add_paragraph {
2663 my ($self, $color, $para, $indent) = @_; 3171 my $self = shift;
2664 3172
2665 my ($text, @w) = ref $para ? @$para : $para; 3173 for my $para (@_) {
2666
2667 $para = { 3174 $para = {
3175 fg => [1, 1, 1, 1],
3176 indent => 0,
3177 markup => "",
3178 widget => [],
3179 ref $para ? %$para : (markup => $para),
2668 w => 1e10, 3180 w => 1e10,
2669 wrapped => 1, 3181 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2674 }; 3182 };
2675 3183
2676 $self->add (@w) if @w; 3184 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677 push @{$self->{par}}, $para; 3185 push @{$self->{par}}, $para;
3186 }
3187
3188 if (my $max = $self->{max_par}) {
3189 shift @{$self->{par}} while @{$self->{par}} > $max;
3190 }
2678 3191
2679 $self->{need_reflow}++; 3192 $self->{need_reflow}++;
2680 $self->update; 3193 $self->update;
2681} 3194}
2682 3195
2683sub scroll_to_bottom { 3196sub scroll_to_bottom {
2684 my ($self) = @_; 3197 my ($self) = @_;
2685 3198
2686 $self->{scroll_to_bottom} = 1; 3199 $self->{scroll_to} = $#{$self->{par}};
2687 $self->update; 3200 $self->update;
2688} 3201}
2689 3202
3203sub force_uptodate {
3204 my ($self) = @_;
3205
3206 if (delete $self->{need_reflow}) {
3207 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3208
3209 my $height = 0;
3210
3211 for my $para (@{$self->{par}}) {
3212 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3213 my $layout = $self->get_layout ($para);
3214 my ($w, $h) = $layout->size;
3215
3216 $para->{w} = $w + $para->{indent};
3217 $para->{h} = $h;
3218 $para->{wrapped} = $layout->has_wrapped;
3219 }
3220
3221 $para->{y} = $height;
3222 $height += $para->{h};
3223 }
3224
3225 $self->{height} = $height;
3226 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3227
3228 delete $self->{texture};
3229 }
3230
3231 if (my $paridx = delete $self->{scroll_to}) {
3232 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3233 }
3234}
3235
2690sub update { 3236sub update {
2691 my ($self) = @_; 3237 my ($self) = @_;
2692 3238
2693 $self->SUPER::update; 3239 $self->SUPER::update;
2694 3240
2695 return unless $self->{h} > 0; 3241 return unless $self->{h} > 0;
2696 3242
2697 delete $self->{texture}; 3243 delete $self->{texture};
2698 3244
2699 $ROOT->on_post_alloc ($self => sub { 3245 $ROOT->on_post_alloc ($self => sub {
3246 $self->force_uptodate;
3247
2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3248 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701 3249
2702 if (delete $self->{need_reflow}) {
2703 my $height = 0;
2704
2705 for my $para (@{$self->{par}}) {
2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707 my $layout = $self->get_layout ($para);
2708 my ($w, $h) = $layout->size;
2709
2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2713 }
2714
2715 $height += $para->{h};
2716 }
2717
2718 $self->{height} = $height;
2719
2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3250 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730 glClearColor 0, 0, 0, 0; 3251 glClearColor 0, 0, 0, 0;
2731 glClear GL_COLOR_BUFFER_BIT; 3252 glClear GL_COLOR_BUFFER_BIT;
2732 3253
3254 package CFPlus::UI::Base;
3255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3256 (0, 0, $self->{w}, $self->{h});
3257
3258 my $top = int $self->{children}[1]{range}[0];
3259
3260 my $paridx = 0;
3261 my $top_paragraph;
2733 my $top = int $self->{children}[1]{range}[0]; 3262 my $top = int $self->{children}[1]{range}[0];
2734 3263
2735 my $y0 = $top; 3264 my $y0 = $top;
2736 my $y1 = $top + $H; 3265 my $y1 = $top + $H;
2737 3266
2738 my $y = 0;
2739
2740 for my $para (@{$self->{par}}) { 3267 for my $para (@{$self->{par}}) {
2741 my $h = $para->{h}; 3268 my $h = $para->{h};
3269 my $y = $para->{y};
2742 3270
2743 if ($y0 < $y + $h && $y < $y1) { 3271 if ($y0 < $y + $h && $y < $y1) {
2744
2745 my $layout = $self->get_layout ($para); 3272 my $layout = $self->get_layout ($para);
2746 3273
2747 $layout->render ($para->{indent}, $y - $y0); 3274 $layout->render ($para->{indent}, $y - $y0);
2748 3275
2749 if (my @w = @{ $para->{widget} }) { 3276 if (my @w = @{ $para->{widget} }) {
… …
2758 $_->draw; 3285 $_->draw;
2759 } 3286 }
2760 } 3287 }
2761 } 3288 }
2762 3289
2763 $y += $h; 3290 $paridx++;
3291 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3292 }
3293
3294 $self->{top_paragraph} = $top_paragraph;
2765 }; 3295 };
2766 }); 3296 });
2767} 3297}
2768 3298
2769sub reconfigure { 3299sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3317 $self->{children}[1]->draw;
2788} 3318}
2789 3319
2790############################################################################# 3320#############################################################################
2791 3321
2792package CFClient::UI::Animator; 3322package CFPlus::UI::Animator;
2793 3323
2794use CFClient::OpenGL; 3324use CFPlus::OpenGL;
2795 3325
2796our @ISA = CFClient::UI::Bin::; 3326our @ISA = CFPlus::UI::Bin::;
2797 3327
2798sub moveto { 3328sub moveto {
2799 my ($self, $x, $y) = @_; 3329 my ($self, $x, $y) = @_;
2800 3330
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3331 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3359 glPopMatrix;
2830} 3360}
2831 3361
2832############################################################################# 3362#############################################################################
2833 3363
2834package CFClient::UI::Flopper; 3364package CFPlus::UI::Flopper;
2835 3365
2836our @ISA = CFClient::UI::Button::; 3366our @ISA = CFPlus::UI::Button::;
2837 3367
2838sub new { 3368sub new {
2839 my $class = shift; 3369 my $class = shift;
2840 3370
2841 my $self = $class->SUPER::new ( 3371 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3383 $self->{other}->toggle_visibility;
2854} 3384}
2855 3385
2856############################################################################# 3386#############################################################################
2857 3387
2858package CFClient::UI::Tooltip; 3388package CFPlus::UI::Tooltip;
2859 3389
2860our @ISA = CFClient::UI::Bin::; 3390our @ISA = CFPlus::UI::Bin::;
2861 3391
2862use CFClient::OpenGL; 3392use CFPlus::OpenGL;
2863 3393
2864sub new { 3394sub new {
2865 my $class = shift; 3395 my $class = shift;
2866 3396
2867 $class->SUPER::new ( 3397 $class->SUPER::new (
… …
2870 ) 3400 )
2871} 3401}
2872 3402
2873sub set_tooltip_from { 3403sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3404 my ($self, $widget) = @_;
3405
3406 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3407 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3408
2876 my $tooltip = $widget->{tooltip}; 3409 my $tooltip = $widget->{tooltip};
2877 3410
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3411 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3412 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3416 }
2884 3417
2885 $tooltip =~ s/^\n+//; 3418 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3419 $tooltip =~ s/\n+$//;
2887 3420
2888 $self->add (new CFClient::UI::Label 3421 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3422 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3423 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3424 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3425 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3426 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3427 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3428 );
2896} 3429}
2897 3430
… …
2916 3449
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3450 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3451 my $widget = $self->{owner}
2919 or return; 3452 or return;
2920 3453
3454 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3455 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3456
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3457 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3458 if $x + $self->{w} > $self->{root}{w};
2925 3459
2926 $self->move_abs ($x, $y); 3460 $self->move_abs ($x, $y);
3461 } else {
3462 $self->hide;
3463 }
2927 }); 3464 });
2928} 3465}
2929 3466
2930sub _draw { 3467sub _draw {
2931 my ($self) = @_; 3468 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3492 $self->SUPER::_draw;
2956} 3493}
2957 3494
2958############################################################################# 3495#############################################################################
2959 3496
2960package CFClient::UI::Face; 3497package CFPlus::UI::Face;
2961 3498
2962our @ISA = CFClient::UI::Base::; 3499our @ISA = CFPlus::UI::DrawBG::;
2963 3500
2964use CFClient::OpenGL; 3501use CFPlus::OpenGL;
2965 3502
2966sub new { 3503sub new {
2967 my $class = shift; 3504 my $class = shift;
2968 3505
2969 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
2970 aspect => 1, 3509 aspect => 1,
2971 can_events => 0, 3510 can_events => 0,
2972 @_, 3511 @_,
2973 ); 3512 );
2974 3513
2975 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
2977 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3520 parked => 1,
2981 interval => $self->{animspeed},
2982 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
2983 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
2984 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
2985 }, 3529 },
2986 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
2987 } 3534 }
2988 3535
2989 $self 3536 $self
2990} 3537}
2991 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
2992sub size_request { 3569sub size_request {
2993 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
2994} 3585}
2995 3586
2996sub update { 3587sub update {
2997 my ($self) = @_; 3588 my ($self) = @_;
2998 3589
2999 return unless $self->{visible}; 3590 return unless $self->{visible};
3000 3591
3001 $self->SUPER::update; 3592 $self->SUPER::update;
3002} 3593}
3003 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3004sub _draw { 3603sub _draw {
3005 my ($self) = @_; 3604 my ($self) = @_;
3006 3605
3007 return unless $::CONN; 3606 return unless $::CONN;
3008 3607
3009 my $face; 3608 $self->SUPER::_draw;
3010 3609
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3611 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3612
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
3019 3614
3020 if ($tex) { 3615 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
… …
3027} 3622}
3028 3623
3029sub destroy { 3624sub destroy {
3030 my ($self) = @_; 3625 my ($self) = @_;
3031 3626
3032 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3033 if $self->{timer}; 3628 if $self->{timer};
3034 3629
3035 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3036} 3631}
3037 3632
3038############################################################################# 3633#############################################################################
3039 3634
3040package CFClient::UI::Buttonbar; 3635package CFPlus::UI::Buttonbar;
3041 3636
3042our @ISA = CFClient::UI::HBox::; 3637our @ISA = CFPlus::UI::HBox::;
3043 3638
3044# TODO: should actualyl wrap buttons and other goodies. 3639# TODO: should actually wrap buttons and other goodies.
3045 3640
3046############################################################################# 3641#############################################################################
3047 3642
3048package CFClient::UI::Menu; 3643package CFPlus::UI::Menu;
3049 3644
3050our @ISA = CFClient::UI::FancyFrame::; 3645our @ISA = CFPlus::UI::Toplevel::;
3051 3646
3052use CFClient::OpenGL; 3647use CFPlus::OpenGL;
3053 3648
3054sub new { 3649sub new {
3055 my $class = shift; 3650 my $class = shift;
3056 3651
3057 my $self = $class->SUPER::new ( 3652 my $self = $class->SUPER::new (
3058 items => [], 3653 items => [],
3059 z => 100, 3654 z => 100,
3060 @_, 3655 @_,
3061 ); 3656 );
3062 3657
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3658 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3659
3065 for my $item (@{ $self->{items} }) { 3660 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3661 my ($widget, $cb, $tooltip) = @$item;
3067 3662
3068 # handle various types of items, only text for now 3663 # handle various types of items, only text for now
3069 if (!ref $widget) { 3664 if (!ref $widget) {
3070 if ($widget =~ /\t/) { 3665 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2; 3666 my ($left, $right) = split /\t/, $widget, 2;
3072 3667
3073 $widget = new CFClient::UI::HBox 3668 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3669 can_hover => 1,
3075 can_events => 1, 3670 can_events => 1,
3076 tooltip => $tooltip, 3671 tooltip => $tooltip,
3077 children => [ 3672 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1), 3673 (new CFPlus::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1), 3674 (new CFPlus::UI::Label markup => $right, align => +1),
3080 ], 3675 ],
3081 ; 3676 ;
3082 3677
3083 } else { 3678 } else {
3084 $widget = new CFClient::UI::Label 3679 $widget = new CFPlus::UI::Label
3085 can_hover => 1, 3680 can_hover => 1,
3086 can_events => 1, 3681 can_events => 1,
3087 markup => $widget, 3682 markup => $widget,
3088 tooltip => $tooltip; 3683 tooltip => $tooltip;
3089 } 3684 }
… …
3137 1 3732 1
3138} 3733}
3139 3734
3140############################################################################# 3735#############################################################################
3141 3736
3142package CFClient::UI::Multiplexer; 3737package CFPlus::UI::Multiplexer;
3143 3738
3144our @ISA = CFClient::UI::Container::; 3739our @ISA = CFPlus::UI::Container::;
3145 3740
3146sub new { 3741sub new {
3147 my $class = shift; 3742 my $class = shift;
3148 3743
3149 my $self = $class->SUPER::new ( 3744 my $self = $class->SUPER::new (
… …
3210 $self->{current}->draw; 3805 $self->{current}->draw;
3211} 3806}
3212 3807
3213############################################################################# 3808#############################################################################
3214 3809
3215package CFClient::UI::Notebook; 3810package CFPlus::UI::Notebook;
3216 3811
3217our @ISA = CFClient::UI::VBox::; 3812our @ISA = CFPlus::UI::VBox::;
3218 3813
3219sub new { 3814sub new {
3220 my $class = shift; 3815 my $class = shift;
3221 3816
3222 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar), 3818 buttonbar => (new CFPlus::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3819 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self 3820 # filter => # will be put between multiplexer and $self
3226 @_, 3821 @_,
3227 ); 3822 );
3228 3823
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3824 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233} 3828}
3234 3829
3235sub add { 3830sub add {
3236 my ($self, $title, $widget, $tooltip) = @_; 3831 my ($self, $title, $widget, $tooltip) = @_;
3237 3832
3238 Scalar::Util::weaken $self; 3833 CFPlus::weaken $self;
3239 3834
3240 $self->{buttonbar}->add (new CFClient::UI::Button 3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3241 markup => $title, 3836 markup => $title,
3242 tooltip => $tooltip, 3837 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) }, 3838 on_activate => sub { $self->set_current_page ($widget) },
3244 ); 3839 );
3245 3840
… …
3259 $self->emit (page_changed => $self->{multiplexer}{current}); 3854 $self->emit (page_changed => $self->{multiplexer}{current});
3260} 3855}
3261 3856
3262############################################################################# 3857#############################################################################
3263 3858
3264package CFClient::UI::Combobox; 3859package CFPlus::UI::Selector;
3265 3860
3266use utf8; 3861use utf8;
3267 3862
3268our @ISA = CFClient::UI::Button::; 3863our @ISA = CFPlus::UI::Button::;
3269 3864
3270sub new { 3865sub new {
3271 my $class = shift; 3866 my $class = shift;
3272 3867
3273 my $self = $class->SUPER::new ( 3868 my $self = $class->SUPER::new (
… …
3290 my ($value, $title, $tooltip) = @$_; 3885 my ($value, $title, $tooltip) = @$_;
3291 3886
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3887 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 } 3888 }
3294 3889
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3890 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296} 3891}
3297 3892
3298sub _set_value { 3893sub _set_value {
3299 my ($self, $value) = @_; 3894 my ($self, $value) = @_;
3300 3895
… …
3315 $self->emit (changed => $value); 3910 $self->emit (changed => $value);
3316} 3911}
3317 3912
3318############################################################################# 3913#############################################################################
3319 3914
3320package CFClient::UI::Statusbox; 3915package CFPlus::UI::Statusbox;
3321 3916
3322our @ISA = CFClient::UI::VBox::; 3917our @ISA = CFPlus::UI::VBox::;
3323 3918
3324sub new { 3919sub new {
3325 my $class = shift; 3920 my $class = shift;
3326 3921
3327 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
3328 fontsize => 0.8, 3923 fontsize => 0.8,
3329 @_, 3924 @_,
3330 ); 3925 );
3331 3926
3332 Scalar::Util::weaken (my $this = $self); 3927 CFPlus::weaken (my $this = $self);
3333 3928
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335 3930
3336 $self 3931 $self
3337} 3932}
… …
3339sub reorder { 3934sub reorder {
3340 my ($self) = @_; 3935 my ($self) = @_;
3341 my $NOW = Time::HiRes::time; 3936 my $NOW = Time::HiRes::time;
3342 3937
3343 # freeze display when hovering over any label 3938 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner} 3939 return if $CFPlus::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3940 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} }; 3941 values %{ $self->{item} };
3347 3942
3348 while (my ($k, $v) = each %{ $self->{item} }) { 3943 while (my ($k, $v) = each %{ $self->{item} }) {
3349 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3944 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350 } 3945 }
… …
3371 for ($short) { 3966 for ($short) {
3372 s/^\s+//; 3967 s/^\s+//;
3373 s/\s+/ /g; 3968 s/\s+/ /g;
3374 } 3969 }
3375 3970
3376 new CFClient::UI::Label 3971 new CFPlus::UI::Label
3377 markup => $short, 3972 markup => $short,
3378 tooltip => $item->{tooltip}, 3973 tooltip => $item->{tooltip},
3379 tooltip_font => $::FONT_PROP, 3974 tooltip_font => $::FONT_PROP,
3380 tooltip_width => 0.67, 3975 tooltip_width => 0.67,
3381 fontsize => $item->{fontsize} || $self->{fontsize}, 3976 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3460 $self->SUPER::destroy; 4055 $self->SUPER::destroy;
3461} 4056}
3462 4057
3463############################################################################# 4058#############################################################################
3464 4059
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root; 4060package CFPlus::UI::Root;
3630 4061
3631our @ISA = CFClient::UI::Container::; 4062our @ISA = CFPlus::UI::Container::;
3632 4063
3633use List::Util qw(min max); 4064use List::Util qw(min max);
3634 4065
3635use CFClient::OpenGL; 4066use CFPlus::OpenGL;
3636 4067
3637sub new { 4068sub new {
3638 my $class = shift; 4069 my $class = shift;
3639 4070
3640 my $self = $class->SUPER::new ( 4071 my $self = $class->SUPER::new (
3641 visible => 1, 4072 visible => 1,
3642 @_, 4073 @_,
3643 ); 4074 );
3644 4075
3645 Scalar::Util::weaken ($self->{root} = $self); 4076 CFPlus::weaken ($self->{root} = $self);
3646 4077
3647 $self 4078 $self
3648} 4079}
3649 4080
3650sub size_request { 4081sub size_request {
… …
3819 $h = 0 if $h < 0; 4250 $h = 0 if $h < 0;
3820 4251
3821 $w = max $widget->{min_w}, $w; 4252 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h; 4253 $h = max $widget->{min_h}, $h;
3823 4254
4255# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4256# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4257
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4258 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4259 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826 4260
3827 $w = int $w + 0.5; 4261 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4262 $h = int $h + 0.5;
… …
3841 4275
3842 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
3843 $_->() 4277 $_->()
3844 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
3845 } 4279 }
3846
3847 4280
3848 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
3851 4284
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4287 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4288 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4289 glLoadIdentity;
3857 4290
3858 { 4291 {
3859 package CFClient::UI::Base; 4292 package CFPlus::UI::Base;
3860 4293
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4294 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4295 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4296
3865 $self->_draw; 4297 $self->_draw;
4298 }
3866} 4299}
3867 4300
3868############################################################################# 4301#############################################################################
3869 4302
3870package CFClient::UI; 4303package CFPlus::UI;
3871 4304
3872$ROOT = new CFClient::UI::Root; 4305$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4306$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4307
38751 43081
3876 4309

Diff Legend

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