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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 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 warn "button down $ev->{button}\n";#d# 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
89 105
90 if (!$BUTTON_STATE) { 106 unless ($GRAB) {
91 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
92 108
93 $GRAB = $widget; 109 $GRAB = $widget;
94 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
95 111
96 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
97 } 113 }
98 114
99 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
100 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
102 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 }
103} 125}
104 126
105sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
106 my ($ev) = @_; 128 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y});
108 129
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110 131
111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112 133
113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
114 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115 136
116 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
117 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
118 $grab->update if $grab; 139 $grab->update if $grab;
119 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
120 141
142 check_hover $widget;
121 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
122 } 144 }
123} 145}
124 146
125sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
126 my ($ev) = @_; 148 my ($ev) = @_;
127 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
128 150
129 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130 152
131 if ($widget != $HOVER) { 153 check_hover $widget;
132 my $hover = $HOVER; $HOVER = $widget;
133 154
134 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
135 $HOVER->update if $HOVER && $HOVER->{can_hover};
136
137 $TOOLTIP_WATCHER->start;
138 }
139
140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141 if $HOVER; 156 if $HOVER;
142} 157}
143 158
144# convert position array to integers 159# convert position array to integers
145sub harmonize { 160sub harmonize {
… …
195 reconfigure_widgets; 210 reconfigure_widgets;
196} 211}
197 212
198############################################################################# 213#############################################################################
199 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
200package CFClient::UI::Base; 223package CFPlus::UI::Base;
201 224
202use strict; 225use strict;
203 226
204use CFClient::OpenGL; 227use CFPlus::OpenGL;
205 228
206sub new { 229sub new {
207 my $class = shift; 230 my $class = shift;
208 231
209 my $self = bless { 232 my $self = bless {
… …
214 h => undef, 237 h => undef,
215 can_events => 1, 238 can_events => 1,
216 @_ 239 @_
217 }, $class; 240 }, $class;
218 241
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220 243
221 for (keys %$self) { 244 for (keys %$self) {
222 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
223 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
224 } 247 }
225 } 248 }
226 249
227 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228 $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};
229 $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};
230 $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};
231 $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};
232 255
233 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235 258
236 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
241 264
242sub destroy { 265sub destroy {
243 my ($self) = @_; 266 my ($self) = @_;
244 267
245 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
246 %$self = (); 270 %$self = ();
247} 271}
248 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
249sub show { 277sub show {
250 my ($self) = @_; 278 my ($self) = @_;
251 279
252 return if $self->{parent}; 280 return if $self->{parent};
253 281
254 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
255} 283}
256 284
257sub set_visible { 285sub set_visible {
258 my ($self) = @_; 286 my ($self) = @_;
259 287
… …
280 delete $self->{root}; 308 delete $self->{root};
281 309
282 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
283 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
284 312
285 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
286 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
287 315
288 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
289 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
290} 318}
… …
292sub set_visibility { 320sub set_visibility {
293 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
294 322
295 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
296 324
297 $visible ? $self->hide 325 $visible ? $self->show
298 : $self->show; 326 : $self->hide;
299} 327}
300 328
301sub toggle_visibility { 329sub toggle_visibility {
302 my ($self) = @_; 330 my ($self) = @_;
303 331
… …
347 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
348 376
349 if ($self->{aspect}) { 377 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
351 379
352 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354 382
355 # use alignment to adjust x, y 383 # use alignment to adjust x, y
356 384
357 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
358 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
399 427
400 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
401 429
402 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
403 431
404 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
406 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
407 } 435 }
408} 436}
409 437
410# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
411sub coord2local { 439sub coord2local {
412 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
413 441
442 Carp::confess unless $self->{parent};#d#
443
414 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415} 445}
416 446
417# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
418sub coord2global { 448sub coord2global {
419 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
450
451 Carp::confess unless $self->{parent};#d#
420 452
421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422} 454}
423 455
424sub invoke_focus_in { 456sub invoke_focus_in {
… …
458 490
459sub invoke_mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
460sub invoke_button_up { 0 } 492sub invoke_button_up { 0 }
461sub invoke_key_down { 0 } 493sub invoke_key_down { 0 }
462sub invoke_key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
463 496
464sub invoke_button_down { 497sub invoke_button_down {
465 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
466 499
467 $self->grab_focus; 500 $self->grab_focus;
468 501
469 warn "button down $ev->{button} $x $y\n";#d#
470
471 0 502 0
472} 503}
473 504
474sub connect { 505sub connect {
475 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
476 507
477 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 }
478} 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);
479 528
480sub emit { 529sub emit {
481 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
482 531
483 #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
484 (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
485 || ($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
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
487} 550}
488 551
489sub find_widget { 552sub find_widget {
490 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
491 554
… …
499} 562}
500 563
501sub set_parent { 564sub set_parent {
502 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
503 566
504 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
505 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
506} 569}
507 570
508sub realloc { 571sub realloc {
509 my ($self) = @_; 572 my ($self) = @_;
… …
575 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
578 glEnd; 641 glEnd;
579 glPopMatrix; 642 glPopMatrix;
580 #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;
581 } 644 }
582 645
583 $self->_draw; 646 $self->_draw;
584 glPopMatrix; 647 glPopMatrix;
585} 648}
… …
588 my ($self) = @_; 651 my ($self) = @_;
589 652
590 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
591} 654}
592 655
656my $cntx;#d#
593sub DESTROY { 657sub DESTROY {
594 my ($self) = @_; 658 my ($self) = @_;
595 659
596 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
597
598 delete $WIDGET{$self+0};
599 661
600 eval { $self->destroy }; 662 eval { $self->destroy };
601 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};
602} 666}
603 667
604############################################################################# 668#############################################################################
605 669
606package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
607 671
608our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
609 673
610use strict; 674use strict;
611use CFClient::OpenGL; 675use CFPlus::OpenGL;
612 676
613sub new { 677sub new {
614 my $class = shift; 678 my $class = shift;
615 679
616 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
647 } 711 }
648} 712}
649 713
650############################################################################# 714#############################################################################
651 715
652package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
653 717
654our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
655 719
656sub new { 720sub new {
657 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
658 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
659} 723}
… …
666 730
667sub draw { } 731sub draw { }
668 732
669############################################################################# 733#############################################################################
670 734
671package CFClient::UI::Container; 735package CFPlus::UI::Container;
672 736
673our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
674 738
675sub new { 739sub new {
676 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
677 741
678 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
687 if $children; 751 if $children;
688 752
689 $self 753 $self
690} 754}
691 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
692sub add { 764sub add {
693 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
694 766
695 $_->set_parent ($self) 767 $_->set_parent ($self)
696 for @widgets; 768 for @widgets;
… …
756 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
757} 829}
758 830
759############################################################################# 831#############################################################################
760 832
761package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
762 834
763our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
764 836
765sub new { 837sub new {
766 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
767 839
768 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769 841
770 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
771} 843}
772 844
773sub add { 845sub add {
… …
780sub remove { 852sub remove {
781 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
782 854
783 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
784 856
785 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
786 unless @{$self->{children}}; 858 unless @{$self->{children}};
787} 859}
788 860
789sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
790 862
… …
802 874
803############################################################################# 875#############################################################################
804 876
805# back-buffered drawing area 877# back-buffered drawing area
806 878
807package CFClient::UI::Window; 879package CFPlus::UI::Window;
808 880
809our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
810 882
811use CFClient::OpenGL; 883use CFPlus::OpenGL;
812 884
813sub new { 885sub new {
814 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
815 887
816 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
838} 910}
839 911
840sub render_child { 912sub render_child {
841 my ($self) = @_; 913 my ($self) = @_;
842 914
843 $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 {
844 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
845 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
846 918
847 { 919 {
848 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
849 921
850 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
852 } 926 }
853
854 $self->_render;
855 }; 927 };
856} 928}
857 929
858sub _draw { 930sub _draw {
859 my ($self) = @_; 931 my ($self) = @_;
860
861 my ($w, $h) = @$self{qw(w h)};
862 932
863 my $tex = $self->{texture} 933 my $tex = $self->{texture}
864 or return; 934 or return;
865 935
866 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
869 939
870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
871 941
872 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
873} 943}
874 944
875############################################################################# 945#############################################################################
876 946
877package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
878 948
949use List::Util qw(min max);
950
879our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
880 952
881sub new { 953sub new {
882 my $class = shift; 954 my $class = shift;
883 955
884 $class->SUPER::new ( 956 $class->SUPER::new (
… …
914} 986}
915 987
916sub set_offset { 988sub set_offset {
917 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
918 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}) {
919 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
920 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
921 997
998 $self->emit (changed => $x, $y);
922 $self->update; 999 $self->update;
1000 }
923} 1001}
924 1002
925# 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
926sub coord2local { 1004sub coord2local {
927 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
944 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
946 ) { 1024 ) {
947 $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})
948 } else { 1026 } else {
949 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
950 } 1028 }
951} 1029}
952 1030
953sub _render { 1031sub _render {
954 my ($self) = @_; 1032 my ($self) = @_;
955 1033
956 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};
957 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};
958 1036
959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960 1038
961 $self->SUPER::_render; 1039 $self->SUPER::_render;
962} 1040}
963 1041
964############################################################################# 1042#############################################################################
965 1043
966package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
967 1045
968our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
969 1047
970sub new { 1048sub new {
971 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
972 1050
973 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
974 1052
975 my $self; 1053 my $self;
976 1054
977 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
978 vertical => 1, 1065 vertical => 1,
979 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
980 on_changed => sub { 1067 on_changed => sub {
981 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982 }, 1070 },
983 ; 1071 ;
984 1072
985 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
987 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
988 %arg, 1081 %arg,
989 ); 1082 );
990 1083
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 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
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
992 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
993 1101
994 $self 1102 $self
995} 1103}
996 1104
… …
1000 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1001 1109
1002 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1003} 1111}
1004 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
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_at (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_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
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
1005sub invoke_button_down { 1154sub invoke_button_down {
1006 my ($self, $ev) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1007 1156
1008 warn "button down $ev->{button}\n";#d# 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;
1009 1171 }
1172
1010 0 1173 0
1011} 1174}
1012 1175
1013sub update_slider { 1176sub invoke_button_up {
1014 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1015 1178
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if (delete $self->{motion}) {
1017} 1180 return 1;
1181 }
1018 1182
1019sub update { 1183 0
1020 my ($self) = @_; 1184}
1021 1185
1022 $self->SUPER::update; 1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1023 1188
1024 $self->update_slider; 1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1025} 1195}
1026 1196
1027sub invoke_size_allocate { 1197sub invoke_size_allocate {
1028 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1029 1199
1030 $self->update_slider; 1200 $self->update_slider;
1031
1032 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1033} 1202}
1034 1203
1035############################################################################# 1204#############################################################################
1036 1205
1037package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1038 1207
1039our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1040 1209
1041use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1042 1211
1043sub new { 1212sub new {
1044 my $class = shift; 1213 my $class = shift;
1045 1214
1046 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1072 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1073} 1242}
1074 1243
1075############################################################################# 1244#############################################################################
1076 1245
1077package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1078 1247
1079our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1080 1249
1081use 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;
1082 1351
1083my $bg = 1352my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1086 1355
1087my @border = 1356my @border =
1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089 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);
1090 1363
1091sub new { 1364sub new {
1092 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1093 1366
1094 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1099 min_w => 64, 1372 min_w => 64,
1100 min_h => 32, 1373 min_h => 32,
1101 %arg, 1374 %arg,
1102 ); 1375 );
1103 1376
1104 $self->{title_widget} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1105 align => 0, 1378 align => 0,
1106 valign => 1, 1379 valign => 1,
1107 text => $self->{title}, 1380 text => $self->{title},
1108 fontsize => $self->{border}, 1381 fontsize => $self->{border},
1109 if exists $self->{title}; 1382 if exists $self->{title};
1110 1383
1111 if ($self->{has_close_button}) { 1384 if ($self->{has_close_button}) {
1112 $self->{close_button} = 1385 $self->{close_button} =
1113 new CFClient::UI::ImageButton 1386 new CFPlus::UI::ImageButton
1114 path => 'x1_close.png', 1387 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") }; 1388 on_activate => sub { $self->emit ("delete") };
1116 1389
1117 $self->CFClient::UI::Container::add ($self->{close_button}); 1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1118 } 1391 }
1119 1392
1120 $self 1393 $self
1121} 1394}
1122 1395
1123sub add { 1396sub add {
1124 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1125 1398
1126 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1127 $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};
1128 $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};
1129} 1402}
1130 1403
1131sub border { 1404sub border {
1132 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1133} 1406}
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1515
1243 ! ! $self->{motion} 1516 ! ! $self->{motion}
1244} 1517}
1245 1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1525}
1526
1246sub _draw { 1527sub _draw {
1247 my ($self) = @_; 1528 my ($self) = @_;
1248 1529
1249 my $child = $self->{children}[0]; 1530 my $child = $self->{children}[0];
1250 1531
… …
1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1256 1537
1257 my $border = $self->border; 1538 my $border = $self->border;
1258 1539
1259 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1260 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1263 $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);
1264 1559
1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1266 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1267 1562
1268 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1287 if $self->{close_button}; 1582 if $self->{close_button};
1288} 1583}
1289 1584
1290############################################################################# 1585#############################################################################
1291 1586
1292package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1293 1588
1294our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1295 1590
1296use List::Util qw(max sum); 1591use List::Util qw(max sum);
1297 1592
1298use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1299 1594
1300sub new { 1595sub new {
1301 my $class = shift; 1596 my $class = shift;
1302 1597
1303 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1304 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1305 @_, 1602 @_,
1306 ) 1603 )
1307} 1604}
1308 1605
1309sub children { 1606sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1608}
1312 1609
1610# TODO: store row/col info in child widget and use standard add/del
1313sub add { 1611sub add {
1314 my ($self, $x, $y, $child) = @_; 1612 my $self = shift;
1315 1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1620
1621 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1316 $child->set_parent ($self); 1624 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1318 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1630 $self->realloc;
1320} 1631}
1321 1632
1322sub remove { 1633sub remove {
1323 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1324 1635
1325 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1326} 1641}
1327 1642
1328# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1329sub clear { 1644sub clear {
1330 my ($self) = @_; 1645 my ($self) = @_;
… …
1379 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1380 1695
1381 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1382 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1383 1698
1384 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1385 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1386 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1387 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1388 1703
1389 # linearly scale sizes
1390 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392 1705
1393 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1394 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1395 1715
1396 my $y; 1716 my $y;
1397 1717
1398 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1399 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1442 } 1762 }
1443} 1763}
1444 1764
1445############################################################################# 1765#############################################################################
1446 1766
1447package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1448 1768
1769use List::Util qw(min max);
1770
1449our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1450 1852
1451sub size_request { 1853sub size_request {
1452 my ($self) = @_; 1854 my ($self) = @_;
1453 1855
1454 $self->{vertical} 1856 $self->{vertical}
… …
1487 $req[$_] += $space * $children[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children; 1890 for 0 .. $#children;
1489 } 1891 }
1490 } 1892 }
1491 1893
1492 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1493 1895
1494 my $pos = 0; 1896 my $pos = 0;
1495 for (0 .. $#children) { 1897 for (0 .. $#children) {
1496 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1502 1 1904 1
1503} 1905}
1504 1906
1505############################################################################# 1907#############################################################################
1506 1908
1507package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1508 1910
1509our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1510 1912
1511sub new { 1913sub new {
1512 my $class = shift; 1914 my $class = shift;
1513 1915
1514 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1517 ) 1919 )
1518} 1920}
1519 1921
1520############################################################################# 1922#############################################################################
1521 1923
1522package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1523 1925
1524our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1525 1927
1526sub new { 1928sub new {
1527 my $class = shift; 1929 my $class = shift;
1528 1930
1529 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1532 ) 1934 )
1533} 1935}
1534 1936
1535############################################################################# 1937#############################################################################
1536 1938
1537package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1538 1940
1539our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1540 1942
1541use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1542 1944
1543sub new { 1945sub new {
1544 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1545 1947
1546 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1549 #active_bg => none 1951 #active_bg => none
1550 #font => default_font 1952 #font => default_font
1551 #text => initial text 1953 #text => initial text
1552 #markup => initial narkup 1954 #markup => initial narkup
1553 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1554 ellipsise => 3, # end 1957 ellipsise => 3, # end
1555 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1556 fontsize => 1, 1959 fontsize => 1,
1557 align => -1, 1960 align => -1,
1558 valign => -1, 1961 valign => -1,
1559 padding_x => 2, 1962 padding_x => 2,
1560 padding_y => 2, 1963 padding_y => 2,
1561 can_events => 0, 1964 can_events => 0,
1562 %arg 1965 %arg
1563 ); 1966 );
1564 1967
1565 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1566 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1567 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1568 $self->{template} = $layout; 1971 $self->{template} = $layout;
1569 } 1972 }
1570 1973
1571 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1573 } else { 1976 } else {
1574 $self->set_text (delete $self->{text}); 1977 $self->set_text (delete $self->{text});
1575 } 1978 }
1576 1979
1577 $self 1980 $self
1578}
1579
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588} 1981}
1589 1982
1590sub update { 1983sub update {
1591 my ($self) = @_; 1984 my ($self) = @_;
1592 1985
… …
1719 }; 2112 };
1720 2113
1721 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723 2116
1724 $self->{layout}->render ($self->{ox}, $self->{oy}); 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725} 2118}
1726 2119
1727############################################################################# 2120#############################################################################
1728 2121
1729package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1730 2123
1731our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1732 2125
1733use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1734 2127
1735sub new { 2128sub new {
1736 my $class = shift; 2129 my $class = shift;
1737 2130
1738 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1742 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1743 can_hover => 1, 2136 can_hover => 1,
1744 can_focus => 1, 2137 can_focus => 1,
1745 valign => 0, 2138 valign => 0,
1746 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1747 #text => ... 2141 #text => ...
1748 #hidden => "*", 2142 #hidden => "*",
1749 @_ 2143 @_
1750 ) 2144 )
1751} 2145}
… …
1796 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1797 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1798 2192
1799 my $text = $self->get_text; 2193 my $text = $self->get_text;
1800 2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2196
1801 if ($uni == 8) { 2197 if ($uni == 8) {
1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1804 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1805 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1806 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1807 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1808 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1809 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1810 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1811 } elsif ($sym == CFClient::SDLK_END) {
1812 $self->{cursor} = length $text;
1813 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1814 $self->emit ('escape'); 2221 $self->emit ('escape');
1815 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1816 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else { 2226 } else {
1818 return 0; 2227 return 0;
1819 } 2228 }
1820 2229
1821 $self->_set_text ($text); 2230 $self->_set_text ($text);
1822 2231
1823 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1824 2234
1825 1 2235 1
1826} 2236}
1827 2237
1828sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1890 utf8::encode $text; 2300 utf8::encode $text;
1891 2301
1892 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893 } 2303 }
1894 2304
1895 glColor @{$self->{fg}};
1896 glBegin GL_LINES; 2305 glBegin GL_LINES;
1897 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899 glEnd; 2308 glEnd;
1900 } 2309 }
1901} 2310}
1902 2311
2312#############################################################################
2313
1903package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1904 2315
1905our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1906 2317
1907use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1908 2319
1909sub invoke_key_down { 2320sub invoke_key_down {
1910 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1911 2322
1912 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1913 2324
1914 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1915 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1916 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1917 2328
1918 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1919 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1920 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1921 $self->update; 2332 $self->update;
1922 2333
1923 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1924 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1925 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1926 } 2337 }
1927 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1928 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1930 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1931 } 2342 }
1932 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1933 } 2344 }
1934 2345
1935 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1936 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1937 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938 2349
1939 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1940 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1949 1 2360 1
1950} 2361}
1951 2362
1952############################################################################# 2363#############################################################################
1953 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
1954package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1955 2405
1956our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1957 2407
1958use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1959 2409
1960my @tex = 2410my @tex =
1961 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1963 2413
1964sub new { 2414sub new {
1965 my $class = shift; 2415 my $class = shift;
1966 2416
1967 $class->SUPER::new ( 2417 $class->SUPER::new (
1968 padding_x => 4, 2418 padding_x => 4,
1969 padding_y => 4, 2419 padding_y => 4,
1970 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
1971 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
1972 can_hover => 1, 2422 can_hover => 1,
1973 align => 0, 2423 align => 0,
1974 valign => 0, 2424 valign => 0,
1975 can_events => 1, 2425 can_events => 1,
1976 @_ 2426 @_
… …
1994 2444
1995 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1998 2448
2449 my $tex = $tex[$GRAB == $self];
1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000 2451
2001 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2002 2453
2003 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2004} 2455}
2005 2456
2006############################################################################# 2457#############################################################################
2007 2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466
2467use CFPlus::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 padding_x => 2,
2474 padding_y => 2,
2475 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2],
2478 active_bg => [1, 1, 1, 0.5],
2479 state => 0,
2480 can_hover => 1,
2481 @_
2482 )
2483}
2484
2485sub size_request {
2486 my ($self) = @_;
2487
2488 (6) x 2
2489}
2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
2499sub invoke_button_down {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2504 $self->toggle;
2505 } else {
2506 return 0
2507 }
2508
2509 1
2510}
2511
2512sub _draw {
2513 my ($self) = @_;
2514
2515 $self->SUPER::_draw;
2516
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2518
2519 my ($w, $h) = @$self{qw(w h)};
2520
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522
2523 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2524
2525 my $tex = $self->{state} ? $tex[1] : $tex[0];
2526
2527 glEnable GL_TEXTURE_2D;
2528 $tex->draw_quad_alpha (0, 0, $s, $s);
2529 glDisable GL_TEXTURE_2D;
2530}
2531
2532#############################################################################
2533
2534package CFPlus::UI::Image;
2535
2536our @ISA = CFPlus::UI::Base::;
2537
2538use CFPlus::OpenGL;
2539
2540our %texture_cache;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2549
2550 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required";
2552
2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2555
2556 CFPlus::weaken $texture_cache{$self->{path}};
2557
2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2559
2560 $self
2561}
2562
2563sub STORABLE_freeze {
2564 my ($self, $cloning) = @_;
2565
2566 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2568
2569 $self->{path}
2570}
2571
2572sub STORABLE_attach {
2573 my ($self, $cloning, $path) = @_;
2574
2575 $self->new (path => $path)
2576}
2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 ($self->{tex}{w}, $self->{tex}{h})
2582}
2583
2584sub _draw {
2585 my ($self) = @_;
2586
2587 my $tex = $self->{tex};
2588
2589 my ($w, $h) = ($self->{w}, $self->{h});
2590
2591 if ($self->{rot90}) {
2592 glRotate 90, 0, 0, 1;
2593 glTranslate 0, -$self->{w}, 0;
2594
2595 ($w, $h) = ($h, $w);
2596 }
2597
2598 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600
2601 $tex->draw_quad (0, 0, $w, $h);
2602
2603 glDisable GL_TEXTURE_2D;
2604}
2605
2606#############################################################################
2607
2008package CFClient::UI::ImageButton; 2608package CFPlus::UI::ImageButton;
2009 2609
2010our @ISA = CFClient::UI::Image::; 2610our @ISA = CFPlus::UI::Image::;
2011 2611
2012use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2013 2613
2014my %textures; 2614my %textures;
2015 2615
2016sub new { 2616sub new {
2017 my $class = shift; 2617 my $class = shift;
… …
2039 1 2639 1
2040} 2640}
2041 2641
2042############################################################################# 2642#############################################################################
2043 2643
2044package CFClient::UI::CheckBox;
2045
2046our @ISA = CFClient::UI::DrawBG::;
2047
2048my @tex =
2049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052use CFClient::OpenGL;
2053
2054sub new {
2055 my $class = shift;
2056
2057 $class->SUPER::new (
2058 padding_x => 2,
2059 padding_y => 2,
2060 fg => [1, 1, 1],
2061 active_fg => [1, 1, 0],
2062 bg => [0, 0, 0, 0.2],
2063 active_bg => [1, 1, 1, 0.5],
2064 state => 0,
2065 can_hover => 1,
2066 @_
2067 )
2068}
2069
2070sub size_request {
2071 my ($self) = @_;
2072
2073 (6) x 2
2074}
2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2084sub invoke_button_down {
2085 my ($self, $ev, $x, $y) = @_;
2086
2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089 $self->toggle;
2090 } else {
2091 return 0
2092 }
2093
2094 1
2095}
2096
2097sub _draw {
2098 my ($self) = @_;
2099
2100 $self->SUPER::_draw;
2101
2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104 my ($w, $h) = @$self{qw(w h)};
2105
2106 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112 glEnable GL_TEXTURE_2D;
2113 $tex->draw_quad_alpha (0, 0, $s, $s);
2114 glDisable GL_TEXTURE_2D;
2115}
2116
2117#############################################################################
2118
2119package CFClient::UI::Image; 2644package CFPlus::UI::VGauge;
2120 2645
2121our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2122
2123use CFClient::OpenGL;
2124
2125our %texture_cache;
2126
2127sub new {
2128 my $class = shift;
2129
2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2134
2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2137
2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145 $self
2146}
2147
2148sub size_request {
2149 my ($self) = @_;
2150
2151 ($self->{tex}{w}, $self->{tex}{h})
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156
2157 my $tex = $self->{tex};
2158
2159 my ($w, $h) = ($self->{w}, $self->{h});
2160
2161 if ($self->{rot90}) {
2162 glRotate 90, 0, 0, 1;
2163 glTranslate 0, -$self->{w}, 0;
2164
2165 ($w, $h) = ($h, $w);
2166 }
2167
2168 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171 $tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173 glDisable GL_TEXTURE_2D;
2174}
2175
2176#############################################################################
2177
2178package CFClient::UI::VGauge;
2179
2180our @ISA = CFClient::UI::Base::;
2181 2647
2182use List::Util qw(min max); 2648use List::Util qw(min max);
2183 2649
2184use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2185 2651
2186my %tex = ( 2652my %tex = (
2187 food => [ 2653 food => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190 ], 2656 ],
2191 grace => [ 2657 grace => [
2192 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194 ], 2660 ],
2195 hp => [ 2661 hp => [
2196 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198 ], 2664 ],
2199 mana => [ 2665 mana => [
2200 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202 ], 2668 ],
2203); 2669);
2204 2670
2205# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2308 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2309} 2775}
2310 2776
2311############################################################################# 2777#############################################################################
2312 2778
2313package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2314 2780
2315our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2316 2782
2317sub new { 2783sub new {
2318 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2319 2785
2320 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2322 can_hover => 1, 2788 can_hover => 1,
2323 can_events => 1, 2789 can_events => 1,
2324 %arg, 2790 %arg,
2325 ); 2791 );
2326 2792
2327 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330 2796
2331 $self 2797 $self
2332} 2798}
2333 2799
2334sub set_fontsize { 2800sub set_fontsize {
… …
2355 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2356} 2822}
2357 2823
2358############################################################################# 2824#############################################################################
2359 2825
2360package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2361 2827
2362use strict; 2828use strict;
2363 2829
2364use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2365 2831
2366our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2367 2833
2368my @tex = 2834my @tex =
2369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2371 2837
2372sub new { 2838sub new {
2373 my $class = shift; 2839 my $class = shift;
2374 2840
… …
2463 } 2929 }
2464 2930
2465 1 2931 1
2466} 2932}
2467 2933
2934sub invoke_mouse_wheel {
2935 my ($self, $ev) = @_;
2936
2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942
2943 ! ! $delta
2944}
2945
2468sub update { 2946sub update {
2469 my ($self) = @_; 2947 my ($self) = @_;
2470 2948
2471 delete $self->{knob_w}; 2949 delete $self->{knob_w};
2472 $self->SUPER::update; 2950 $self->SUPER::update;
… …
2519 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2520} 2998}
2521 2999
2522############################################################################# 3000#############################################################################
2523 3001
2524package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2525 3003
2526our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2527 3005
2528sub new { 3006sub new {
2529 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2530 3008
2531 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2532 3010
2533 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift }, 3014 to_value => sub { shift },
2537 from_value => sub { shift }, 3015 from_value => sub { shift },
2538 %arg, 3016 %arg,
2539 ); 3017 );
2540 3018
… …
2560sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2562 3040
2563############################################################################# 3041#############################################################################
2564 3042
2565package CFClient::UI::TextScroller; 3043package CFPlus::UI::TextScroller;
2566 3044
2567our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2568 3046
2569use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2570 3048
2571sub new { 3049sub new {
2572 my $class = shift; 3050 my $class = shift;
2573 3051
2574 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
2575 fontsize => 1, 3053 fontsize => 1,
2576 can_events => 0, 3054 can_events => 1,
2577 indent => 0, 3055 indent => 0,
2578 #font => default_font 3056 #font => default_font
2579 @_, 3057 @_,
2580 3058
2581 layout => (new CFClient::Layout), 3059 layout => (new CFPlus::Layout),
2582 par => [], 3060 par => [],
3061 max_par => 0,
2583 height => 0, 3062 height => 0,
2584 children => [ 3063 children => [
2585 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2586 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2587 ], 3066 ],
2588 ); 3067 );
2589 3068
2590 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2591 3070
… …
2621 3100
2622 $self->reflow; 3101 $self->reflow;
2623 3102
2624 local $self->{children} = [$empty, $slider]; 3103 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 3104 $self->SUPER::invoke_size_allocate ($w, $h)
3105}
3106
3107sub invoke_mouse_wheel {
3108 my ($self, $ev) = @_;
3109
3110 return 0 unless $ev->{dy}; # only vertical movements
3111
3112 $self->{children}[1]->emit (mouse_wheel => $ev);
3113
3114 1
2626} 3115}
2627 3116
2628sub get_layout { 3117sub get_layout {
2629 my ($self, $para) = @_; 3118 my ($self, $para) = @_;
2630 3119
… …
2658 3147
2659 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2661} 3150}
2662 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2663sub clear { 3167sub clear {
2664 my ($self) = @_; 3168 my ($self) = @_;
2665 3169
2666 my (undef, undef, @other) = @{ $self->{children} }; 3170 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other; 3171 $self->remove ($_) for @other;
… …
2670 $self->{height} = 0; 3174 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 3176}
2673 3177
2674sub add_paragraph { 3178sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 3179 my $self = shift;
2676 3180
2677 my ($text, @w) = ref $para ? @$para : $para; 3181 for my $para (@_) {
2678
2679 $para = { 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 3188 w => 1e10,
2681 wrapped => 1, 3189 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 3190 };
2687 3191
2688 $self->add (@w) if @w; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
2690 3199
2691 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2692 $self->update; 3201 $self->update;
2693} 3202}
2694 3203
2695sub scroll_to_bottom { 3204sub scroll_to_bottom {
2696 my ($self) = @_; 3205 my ($self) = @_;
2697 3206
2698 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2699 $self->update; 3208 $self->update;
2700} 3209}
2701 3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
3233 $self->{height} = $height;
3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3235
3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
3242}
3243
2702sub update { 3244sub update {
2703 my ($self) = @_; 3245 my ($self) = @_;
2704 3246
2705 $self->SUPER::update; 3247 $self->SUPER::update;
2706 3248
2707 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2708 3250
2709 delete $self->{texture}; 3251 delete $self->{texture};
2710 3252
2711 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713 3257
2714 if (delete $self->{need_reflow}) {
2715 my $height = 0;
2716
2717 for my $para (@{$self->{par}}) {
2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719 my $layout = $self->get_layout ($para);
2720 my ($w, $h) = $layout->size;
2721
2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2725 }
2726
2727 $height += $para->{h};
2728 }
2729
2730 $self->{height} = $height;
2731
2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734 delete $self->{texture};
2735 }
2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2743 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2744 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2745 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2746 3271
2747 my $y0 = $top; 3272 my $y0 = $top;
2748 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2749 3274
2750 my $y = 0;
2751
2752 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2753 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2754 3278
2755 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2756
2757 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2758 3281
2759 $layout->render ($para->{indent}, $y - $y0); 3282 $layout->render ($para->{indent}, $y - $y0);
2760 3283
2761 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
… …
2770 $_->draw; 3293 $_->draw;
2771 } 3294 }
2772 } 3295 }
2773 } 3296 }
2774 3297
2775 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3300 }
3301
3302 $self->{top_paragraph} = $top_paragraph;
2777 }; 3303 };
2778 }); 3304 });
2779} 3305}
2780 3306
2781sub reconfigure { 3307sub reconfigure {
… …
2799 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2800} 3326}
2801 3327
2802############################################################################# 3328#############################################################################
2803 3329
2804package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2805 3331
2806use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2807 3333
2808our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2809 3335
2810sub moveto { 3336sub moveto {
2811 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2812 3338
2813 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2841 glPopMatrix; 3367 glPopMatrix;
2842} 3368}
2843 3369
2844############################################################################# 3370#############################################################################
2845 3371
2846package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2847 3373
2848our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2849 3375
2850sub new { 3376sub new {
2851 my $class = shift; 3377 my $class = shift;
2852 3378
2853 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2865 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2866} 3392}
2867 3393
2868############################################################################# 3394#############################################################################
2869 3395
2870package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2871 3397
2872our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2873 3399
2874use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2875 3401
2876sub new { 3402sub new {
2877 my $class = shift; 3403 my $class = shift;
2878 3404
2879 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2882 ) 3408 )
2883} 3409}
2884 3410
2885sub set_tooltip_from { 3411sub set_tooltip_from {
2886 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2887 3416
2888 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2889 3418
2890 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2895 } 3424 }
2896 3425
2897 $tooltip =~ s/^\n+//; 3426 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//; 3427 $tooltip =~ s/\n+$//;
2899 3428
2900 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2901 markup => $tooltip, 3430 markup => $tooltip,
2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903 fontsize => 0.8, 3432 fontsize => 0.8,
2904 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2905 ellipsise => 0, 3434 ellipsise => 0,
2906 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2907 ); 3436 );
2908} 3437}
2909 3438
… …
2928 3457
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2931 or return; 3460 or return;
2932 3461
3462 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3464
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3466 if $x + $self->{w} > $self->{root}{w};
2937 3467
2938 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2939 }); 3472 });
2940} 3473}
2941 3474
2942sub _draw { 3475sub _draw {
2943 my ($self) = @_; 3476 my ($self) = @_;
… …
2967 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
2968} 3501}
2969 3502
2970############################################################################# 3503#############################################################################
2971 3504
2972package CFClient::UI::Face; 3505package CFPlus::UI::Face;
2973 3506
2974our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
2975 3508
2976use CFClient::OpenGL; 3509use CFPlus::OpenGL;
2977 3510
2978sub new { 3511sub new {
2979 my $class = shift; 3512 my $class = shift;
2980 3513
2981 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
2982 aspect => 1, 3517 aspect => 1,
2983 can_events => 0, 3518 can_events => 0,
2984 @_, 3519 @_,
2985 ); 3520 );
2986 3521
2987 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
2989 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2990 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1, 3528 parked => 1,
2993 interval => $self->{animspeed},
2994 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
2995 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
2996 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
2997 }, 3537 },
2998 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
2999 } 3542 }
3000 3543
3001 $self 3544 $self
3002} 3545}
3003 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3004sub size_request { 3577sub size_request {
3005 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3006} 3593}
3007 3594
3008sub update { 3595sub update {
3009 my ($self) = @_; 3596 my ($self) = @_;
3010 3597
3011 return unless $self->{visible}; 3598 return unless $self->{visible};
3012 3599
3013 $self->SUPER::update; 3600 $self->SUPER::update;
3014} 3601}
3015 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3016sub _draw { 3611sub _draw {
3017 my ($self) = @_; 3612 my ($self) = @_;
3018 3613
3019 return unless $::CONN; 3614 return unless $::CONN;
3020 3615
3021 my $face; 3616 $self->SUPER::_draw;
3022 3617
3023 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3025 3619 or return;
3026 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim;
3028 }
3029 3620
3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3031 3622
3032 if ($tex) { 3623 if ($tex) {
3033 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3039} 3630}
3040 3631
3041sub destroy { 3632sub destroy {
3042 my ($self) = @_; 3633 my ($self) = @_;
3043 3634
3044 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3045 if $self->{timer}; 3636 if $self->{timer};
3046 3637
3047 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3048} 3639}
3049 3640
3050############################################################################# 3641#############################################################################
3051 3642
3052package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3053 3644
3054our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3055 3646
3056# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3057 3648
3058############################################################################# 3649#############################################################################
3059 3650
3060package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
3061 3652
3062our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3063 3654
3064use CFClient::OpenGL; 3655use CFPlus::OpenGL;
3065 3656
3066sub new { 3657sub new {
3067 my $class = shift; 3658 my $class = shift;
3068 3659
3069 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3070 items => [], 3661 items => [],
3071 z => 100, 3662 z => 100,
3072 @_, 3663 @_,
3073 ); 3664 );
3074 3665
3075 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076 3667
3077 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
3078 my ($widget, $cb, $tooltip) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
3079 3670
3080 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
3081 if (!ref $widget) { 3672 if (!ref $widget) {
3082 if ($widget =~ /\t/) { 3673 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2; 3674 my ($left, $right) = split /\t/, $widget, 2;
3084 3675
3085 $widget = new CFClient::UI::HBox 3676 $widget = new CFPlus::UI::HBox
3086 can_hover => 1, 3677 can_hover => 1,
3087 can_events => 1, 3678 can_events => 1,
3088 tooltip => $tooltip, 3679 tooltip => $tooltip,
3089 children => [ 3680 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1), 3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1), 3682 (new CFPlus::UI::Label markup => $right, align => +1),
3092 ], 3683 ],
3093 ; 3684 ;
3094 3685
3095 } else { 3686 } else {
3096 $widget = new CFClient::UI::Label 3687 $widget = new CFPlus::UI::Label
3097 can_hover => 1, 3688 can_hover => 1,
3098 can_events => 1, 3689 can_events => 1,
3099 markup => $widget, 3690 markup => $widget,
3100 tooltip => $tooltip; 3691 tooltip => $tooltip;
3101 } 3692 }
… …
3149 1 3740 1
3150} 3741}
3151 3742
3152############################################################################# 3743#############################################################################
3153 3744
3154package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
3155 3746
3156our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
3157 3748
3158sub new { 3749sub new {
3159 my $class = shift; 3750 my $class = shift;
3160 3751
3161 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
3222 $self->{current}->draw; 3813 $self->{current}->draw;
3223} 3814}
3224 3815
3225############################################################################# 3816#############################################################################
3226 3817
3227package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3228 3819
3229our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3230 3821
3231sub new { 3822sub new {
3232 my $class = shift; 3823 my $class = shift;
3233 3824
3234 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3238 @_, 3829 @_,
3239 ); 3830 );
3240 3831
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3245} 3836}
3246 3837
3247sub add { 3838sub add {
3248 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3249 3840
3250 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3251 3842
3252 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3253 markup => $title, 3844 markup => $title,
3254 tooltip => $tooltip, 3845 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3256 ); 3847 );
3257 3848
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3863}
3273 3864
3274############################################################################# 3865#############################################################################
3275 3866
3276package CFClient::UI::Combobox; 3867package CFPlus::UI::Selector;
3277 3868
3278use utf8; 3869use utf8;
3279 3870
3280our @ISA = CFClient::UI::Button::; 3871our @ISA = CFPlus::UI::Button::;
3281 3872
3282sub new { 3873sub new {
3283 my $class = shift; 3874 my $class = shift;
3284 3875
3285 my $self = $class->SUPER::new ( 3876 my $self = $class->SUPER::new (
… …
3302 my ($value, $title, $tooltip) = @$_; 3893 my ($value, $title, $tooltip) = @$_;
3303 3894
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 } 3896 }
3306 3897
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308} 3899}
3309 3900
3310sub _set_value { 3901sub _set_value {
3311 my ($self, $value) = @_; 3902 my ($self, $value) = @_;
3312 3903
… …
3327 $self->emit (changed => $value); 3918 $self->emit (changed => $value);
3328} 3919}
3329 3920
3330############################################################################# 3921#############################################################################
3331 3922
3332package CFClient::UI::Statusbox; 3923package CFPlus::UI::Statusbox;
3333 3924
3334our @ISA = CFClient::UI::VBox::; 3925our @ISA = CFPlus::UI::VBox::;
3335 3926
3336sub new { 3927sub new {
3337 my $class = shift; 3928 my $class = shift;
3338 3929
3339 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3340 fontsize => 0.8, 3931 fontsize => 0.8,
3341 @_, 3932 @_,
3342 ); 3933 );
3343 3934
3344 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3345 3936
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347 3938
3348 $self 3939 $self
3349} 3940}
… …
3351sub reorder { 3942sub reorder {
3352 my ($self) = @_; 3943 my ($self) = @_;
3353 my $NOW = Time::HiRes::time; 3944 my $NOW = Time::HiRes::time;
3354 3945
3355 # freeze display when hovering over any label 3946 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner} 3947 return if $CFPlus::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} }; 3949 values %{ $self->{item} };
3359 3950
3360 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3361 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362 } 3953 }
… …
3383 for ($short) { 3974 for ($short) {
3384 s/^\s+//; 3975 s/^\s+//;
3385 s/\s+/ /g; 3976 s/\s+/ /g;
3386 } 3977 }
3387 3978
3388 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3389 markup => $short, 3980 markup => $short,
3390 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3391 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3392 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3472 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3473} 4064}
3474 4065
3475############################################################################# 4066#############################################################################
3476 4067
3477package CFClient::UI::Inventory;
3478
3479our @ISA = CFClient::UI::Table::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3532
3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
3619 my ($self, $spell) = @_;
3620
3621 $self->{spell}->{$spell->{name}} = $spell;
3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3641package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3642 4069
3643our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3644 4071
3645use List::Util qw(min max); 4072use List::Util qw(min max);
3646 4073
3647use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3648 4075
3649sub new { 4076sub new {
3650 my $class = shift; 4077 my $class = shift;
3651 4078
3652 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3653 visible => 1, 4080 visible => 1,
3654 @_, 4081 @_,
3655 ); 4082 );
3656 4083
3657 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3658 4085
3659 $self 4086 $self
3660} 4087}
3661 4088
3662sub size_request { 4089sub size_request {
… …
3831 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3832 4259
3833 $w = max $widget->{min_w}, $w; 4260 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 4261 $h = max $widget->{min_h}, $h;
3835 4262
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 4268
3839 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
… …
3853 4283
3854 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3855 $_->() 4285 $_->()
3856 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3857 } 4287 }
3858
3859 4288
3860 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3863 4292
… …
3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3868 glLoadIdentity; 4297 glLoadIdentity;
3869 4298
3870 { 4299 {
3871 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3872 4301
3873 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3875 }
3876 4304
3877 $self->_draw; 4305 $self->_draw;
4306 }
3878} 4307}
3879 4308
3880############################################################################# 4309#############################################################################
3881 4310
3882package CFClient::UI; 4311package CFPlus::UI;
3883 4312
3884$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3885$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886 4315
38871 43161
3888 4317

Diff Legend

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