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.381 by root, Thu Jul 19 13:45:18 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
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
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (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 (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
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);
1090 1359
1091sub new { 1360sub new {
1092 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1093 1362
… …
1099 min_w => 64, 1368 min_w => 64,
1100 min_h => 32, 1369 min_h => 32,
1101 %arg, 1370 %arg,
1102 ); 1371 );
1103 1372
1104 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
1105 align => 0, 1374 align => 0,
1106 valign => 1, 1375 valign => 1,
1107 text => $self->{title}, 1376 text => $self->{title},
1108 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1109 if exists $self->{title}; 1378 if exists $self->{title};
1110 1379
1111 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1112 $self->{close_button} = 1381 $self->{close_button} =
1113 new CFClient::UI::ImageButton 1382 new CFPlus::UI::ImageButton
1114 path => 'x1_close.png', 1383 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1116 1385
1117 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1118 } 1387 }
1119 1388
1120 $self 1389 $self
1121} 1390}
1122 1391
1123sub add { 1392sub add {
1124 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1125 1394
1126 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $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}; 1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129} 1398}
1130 1399
1131sub border { 1400sub border {
1132 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1133} 1402}
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1511
1243 ! ! $self->{motion} 1512 ! ! $self->{motion}
1244} 1513}
1245 1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1521}
1522
1246sub _draw { 1523sub _draw {
1247 my ($self) = @_; 1524 my ($self) = @_;
1248 1525
1249 my $child = $self->{children}[0]; 1526 my $child = $self->{children}[0];
1250 1527
… …
1287 if $self->{close_button}; 1564 if $self->{close_button};
1288} 1565}
1289 1566
1290############################################################################# 1567#############################################################################
1291 1568
1292package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1293 1570
1294our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1295 1572
1296use List::Util qw(max sum); 1573use List::Util qw(max sum);
1297 1574
1298use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1299 1576
1300sub new { 1577sub new {
1301 my $class = shift; 1578 my $class = shift;
1302 1579
1303 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1304 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1305 @_, 1584 @_,
1306 ) 1585 )
1307} 1586}
1308 1587
1309sub children { 1588sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1590}
1312 1591
1592# TODO: store row/col info in child widget and use standard add/del
1313sub add { 1593sub add {
1314 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1315 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1316 $child->set_parent ($self); 1598 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1318 1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1604 $self->realloc;
1320} 1605}
1321 1606
1322sub remove { 1607sub remove {
1323 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1324 1609
1325 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1326} 1615}
1327 1616
1328# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1329sub clear { 1618sub clear {
1330 my ($self) = @_; 1619 my ($self) = @_;
… …
1379 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1380 1669
1381 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1382 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1383 1672
1384 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1385 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1386 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1387 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1388 1677
1389 # linearly scale sizes
1390 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392 1679
1393 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1394 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1395 1689
1396 my $y; 1690 my $y;
1397 1691
1398 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1399 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1442 } 1736 }
1443} 1737}
1444 1738
1445############################################################################# 1739#############################################################################
1446 1740
1447package CFClient::UI::Box; 1741package CFPlus::UI::Fixed;
1448 1742
1743use List::Util qw(min max);
1744
1449our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1450 1826
1451sub size_request { 1827sub size_request {
1452 my ($self) = @_; 1828 my ($self) = @_;
1453 1829
1454 $self->{vertical} 1830 $self->{vertical}
… …
1487 $req[$_] += $space * $children[$_]{expand} 1863 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children; 1864 for 0 .. $#children;
1489 } 1865 }
1490 } 1866 }
1491 1867
1492 CFClient::UI::harmonize \@req; 1868 CFPlus::UI::harmonize \@req;
1493 1869
1494 my $pos = 0; 1870 my $pos = 0;
1495 for (0 .. $#children) { 1871 for (0 .. $#children) {
1496 my $alloc = $req[$_]; 1872 my $alloc = $req[$_];
1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1502 1 1878 1
1503} 1879}
1504 1880
1505############################################################################# 1881#############################################################################
1506 1882
1507package CFClient::UI::HBox; 1883package CFPlus::UI::HBox;
1508 1884
1509our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1510 1886
1511sub new { 1887sub new {
1512 my $class = shift; 1888 my $class = shift;
1513 1889
1514 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1517 ) 1893 )
1518} 1894}
1519 1895
1520############################################################################# 1896#############################################################################
1521 1897
1522package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1523 1899
1524our @ISA = CFClient::UI::Box::; 1900our @ISA = CFPlus::UI::Box::;
1525 1901
1526sub new { 1902sub new {
1527 my $class = shift; 1903 my $class = shift;
1528 1904
1529 $class->SUPER::new ( 1905 $class->SUPER::new (
… …
1532 ) 1908 )
1533} 1909}
1534 1910
1535############################################################################# 1911#############################################################################
1536 1912
1537package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1538 1914
1539our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1540 1916
1541use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1542 1918
1543sub new { 1919sub new {
1544 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1545 1921
1546 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1549 #active_bg => none 1925 #active_bg => none
1550 #font => default_font 1926 #font => default_font
1551 #text => initial text 1927 #text => initial text
1552 #markup => initial narkup 1928 #markup => initial narkup
1553 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1554 ellipsise => 3, # end 1931 ellipsise => 3, # end
1555 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1556 fontsize => 1, 1933 fontsize => 1,
1557 align => -1, 1934 align => -1,
1558 valign => -1, 1935 valign => -1,
1559 padding_x => 2, 1936 padding_x => 2,
1560 padding_y => 2, 1937 padding_y => 2,
1561 can_events => 0, 1938 can_events => 0,
1562 %arg 1939 %arg
1563 ); 1940 );
1564 1941
1565 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1566 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1567 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1568 $self->{template} = $layout; 1945 $self->{template} = $layout;
1569 } 1946 }
1570 1947
1571 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1573 } else { 1950 } else {
1574 $self->set_text (delete $self->{text}); 1951 $self->set_text (delete $self->{text});
1575 } 1952 }
1576 1953
1577 $self 1954 $self
1578}
1579
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588} 1955}
1589 1956
1590sub update { 1957sub update {
1591 my ($self) = @_; 1958 my ($self) = @_;
1592 1959
… …
1719 }; 2086 };
1720 2087
1721 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723 2090
1724 $self->{layout}->render ($self->{ox}, $self->{oy}); 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725} 2092}
1726 2093
1727############################################################################# 2094#############################################################################
1728 2095
1729package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1730 2097
1731our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1732 2099
1733use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1734 2101
1735sub new { 2102sub new {
1736 my $class = shift; 2103 my $class = shift;
1737 2104
1738 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1742 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1743 can_hover => 1, 2110 can_hover => 1,
1744 can_focus => 1, 2111 can_focus => 1,
1745 valign => 0, 2112 valign => 0,
1746 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1747 #text => ... 2115 #text => ...
1748 #hidden => "*", 2116 #hidden => "*",
1749 @_ 2117 @_
1750 ) 2118 )
1751} 2119}
… …
1796 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1797 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1798 2166
1799 my $text = $self->get_text; 2167 my $text = $self->get_text;
1800 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1801 if ($uni == 8) { 2171 if ($uni == 8) {
1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1804 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1805 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1806 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1807 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1808 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1809 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1810 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1811 } elsif ($sym == CFClient::SDLK_END) {
1812 $self->{cursor} = length $text;
1813 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1814 $self->emit ('escape'); 2195 $self->emit ('escape');
1815 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1816 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else { 2200 } else {
1818 return 0; 2201 return 0;
1819 } 2202 }
1820 2203
1821 $self->_set_text ($text); 2204 $self->_set_text ($text);
1822 2205
1823 $self->realloc; 2206 $self->realloc;
2207 $self->update;
1824 2208
1825 1 2209 1
1826} 2210}
1827 2211
1828sub invoke_focus_in { 2212sub invoke_focus_in {
… …
1890 utf8::encode $text; 2274 utf8::encode $text;
1891 2275
1892 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893 } 2277 }
1894 2278
1895 glColor @{$self->{fg}};
1896 glBegin GL_LINES; 2279 glBegin GL_LINES;
1897 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 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}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899 glEnd; 2282 glEnd;
1900 } 2283 }
1901} 2284}
1902 2285
2286#############################################################################
2287
1903package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1904 2289
1905our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1906 2291
1907use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1908 2293
1909sub invoke_key_down { 2294sub invoke_key_down {
1910 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1911 2296
1912 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1913 2298
1914 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1915 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1916 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1917 2302
1918 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1919 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1920 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1921 $self->update; 2306 $self->update;
1922 2307
1923 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1924 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1925 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1926 } 2311 }
1927 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1928 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1930 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1931 } 2316 }
1932 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1933 } 2318 }
1934 2319
1935 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1936 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1937 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938 2323
1939 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1940 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1949 1 2334 1
1950} 2335}
1951 2336
1952############################################################################# 2337#############################################################################
1953 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1954package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1955 2379
1956our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1957 2381
1958use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1959 2383
1960my @tex = 2384my @tex =
1961 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
1963 2387
1964sub new { 2388sub new {
1965 my $class = shift; 2389 my $class = shift;
1966 2390
1967 $class->SUPER::new ( 2391 $class->SUPER::new (
1968 padding_x => 4, 2392 padding_x => 4,
1969 padding_y => 4, 2393 padding_y => 4,
1970 fg => [1, 1, 1], 2394 fg => [1.0, 1.0, 1.0],
1971 active_fg => [0, 0, 1], 2395 active_fg => [0.8, 0.8, 0.8],
1972 can_hover => 1, 2396 can_hover => 1,
1973 align => 0, 2397 align => 0,
1974 valign => 0, 2398 valign => 0,
1975 can_events => 1, 2399 can_events => 1,
1976 @_ 2400 @_
… …
1994 2418
1995 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1998 2422
2423 my $tex = $tex[$GRAB == $self];
1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2424 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000 2425
2001 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
2002 2427
2003 $self->SUPER::_draw; 2428 $self->SUPER::_draw;
2004} 2429}
2005 2430
2006############################################################################# 2431#############################################################################
2007 2432
2433package CFPlus::UI::CheckBox;
2434
2435our @ISA = CFPlus::UI::DrawBG::;
2436
2437my @tex =
2438 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2439 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2440
2441use CFPlus::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 padding_x => 2,
2448 padding_y => 2,
2449 fg => [1, 1, 1],
2450 active_fg => [1, 1, 0],
2451 bg => [0, 0, 0, 0.2],
2452 active_bg => [1, 1, 1, 0.5],
2453 state => 0,
2454 can_hover => 1,
2455 @_
2456 )
2457}
2458
2459sub size_request {
2460 my ($self) = @_;
2461
2462 (6) x 2
2463}
2464
2465sub toggle {
2466 my ($self) = @_;
2467
2468 $self->{state} = !$self->{state};
2469 $self->emit (changed => $self->{state});
2470 $self->update;
2471}
2472
2473sub invoke_button_down {
2474 my ($self, $ev, $x, $y) = @_;
2475
2476 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2477 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2478 $self->toggle;
2479 } else {
2480 return 0
2481 }
2482
2483 1
2484}
2485
2486sub _draw {
2487 my ($self) = @_;
2488
2489 $self->SUPER::_draw;
2490
2491 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2492
2493 my ($w, $h) = @$self{qw(w h)};
2494
2495 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2496
2497 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2498
2499 my $tex = $self->{state} ? $tex[1] : $tex[0];
2500
2501 glEnable GL_TEXTURE_2D;
2502 $tex->draw_quad_alpha (0, 0, $s, $s);
2503 glDisable GL_TEXTURE_2D;
2504}
2505
2506#############################################################################
2507
2508package CFPlus::UI::Image;
2509
2510our @ISA = CFPlus::UI::Base::;
2511
2512use CFPlus::OpenGL;
2513
2514our %texture_cache;
2515
2516sub new {
2517 my $class = shift;
2518
2519 my $self = $class->SUPER::new (
2520 can_events => 0,
2521 @_,
2522 );
2523
2524 $self->{path} || $self->{tex}
2525 or Carp::croak "'path' or 'tex' attributes required";
2526
2527 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2528 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2529
2530 CFPlus::weaken $texture_cache{$self->{path}};
2531
2532 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2533
2534 $self
2535}
2536
2537sub STORABLE_freeze {
2538 my ($self, $cloning) = @_;
2539
2540 $self->{path}
2541 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2542
2543 $self->{path}
2544}
2545
2546sub STORABLE_attach {
2547 my ($self, $cloning, $path) = @_;
2548
2549 $self->new (path => $path)
2550}
2551
2552sub size_request {
2553 my ($self) = @_;
2554
2555 ($self->{tex}{w}, $self->{tex}{h})
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 my $tex = $self->{tex};
2562
2563 my ($w, $h) = ($self->{w}, $self->{h});
2564
2565 if ($self->{rot90}) {
2566 glRotate 90, 0, 0, 1;
2567 glTranslate 0, -$self->{w}, 0;
2568
2569 ($w, $h) = ($h, $w);
2570 }
2571
2572 glEnable GL_TEXTURE_2D;
2573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2574
2575 $tex->draw_quad (0, 0, $w, $h);
2576
2577 glDisable GL_TEXTURE_2D;
2578}
2579
2580#############################################################################
2581
2008package CFClient::UI::ImageButton; 2582package CFPlus::UI::ImageButton;
2009 2583
2010our @ISA = CFClient::UI::Image::; 2584our @ISA = CFPlus::UI::Image::;
2011 2585
2012use CFClient::OpenGL; 2586use CFPlus::OpenGL;
2013 2587
2014my %textures; 2588my %textures;
2015 2589
2016sub new { 2590sub new {
2017 my $class = shift; 2591 my $class = shift;
… …
2039 1 2613 1
2040} 2614}
2041 2615
2042############################################################################# 2616#############################################################################
2043 2617
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; 2618package CFPlus::UI::VGauge;
2120 2619
2121our @ISA = CFClient::UI::Base::; 2620our @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 2621
2182use List::Util qw(min max); 2622use List::Util qw(min max);
2183 2623
2184use CFClient::OpenGL; 2624use CFPlus::OpenGL;
2185 2625
2186my %tex = ( 2626my %tex = (
2187 food => [ 2627 food => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2629 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190 ], 2630 ],
2191 grace => [ 2631 grace => [
2192 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2632 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/ 2633 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194 ], 2634 ],
2195 hp => [ 2635 hp => [
2196 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2636 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2637 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198 ], 2638 ],
2199 mana => [ 2639 mana => [
2200 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2640 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/ 2641 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202 ], 2642 ],
2203); 2643);
2204 2644
2205# eg. VGauge->new (gauge => 'food'), default gauge: food 2645# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2308 glDisable GL_TEXTURE_2D; 2748 glDisable GL_TEXTURE_2D;
2309} 2749}
2310 2750
2311############################################################################# 2751#############################################################################
2312 2752
2313package CFClient::UI::Gauge; 2753package CFPlus::UI::Gauge;
2314 2754
2315our @ISA = CFClient::UI::VBox::; 2755our @ISA = CFPlus::UI::VBox::;
2316 2756
2317sub new { 2757sub new {
2318 my ($class, %arg) = @_; 2758 my ($class, %arg) = @_;
2319 2759
2320 my $self = $class->SUPER::new ( 2760 my $self = $class->SUPER::new (
… …
2322 can_hover => 1, 2762 can_hover => 1,
2323 can_events => 1, 2763 can_events => 1,
2324 %arg, 2764 %arg,
2325 ); 2765 );
2326 2766
2327 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2767 $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); 2768 $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"); 2769 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330 2770
2331 $self 2771 $self
2332} 2772}
2333 2773
2334sub set_fontsize { 2774sub set_fontsize {
… …
2355 $self->{value}->set_text ($val); 2795 $self->{value}->set_text ($val);
2356} 2796}
2357 2797
2358############################################################################# 2798#############################################################################
2359 2799
2360package CFClient::UI::Slider; 2800package CFPlus::UI::Slider;
2361 2801
2362use strict; 2802use strict;
2363 2803
2364use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2365 2805
2366our @ISA = CFClient::UI::DrawBG::; 2806our @ISA = CFPlus::UI::DrawBG::;
2367 2807
2368my @tex = 2808my @tex =
2369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2809 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370 qw(s1_slider.png s1_slider_bg.png); 2810 qw(s1_slider.png s1_slider_bg.png);
2371 2811
2372sub new { 2812sub new {
2373 my $class = shift; 2813 my $class = shift;
2374 2814
… …
2463 } 2903 }
2464 2904
2465 1 2905 1
2466} 2906}
2467 2907
2908sub invoke_mouse_wheel {
2909 my ($self, $ev) = @_;
2910
2911 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2912
2913 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2914
2915 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2916
2917 ! ! $delta
2918}
2919
2468sub update { 2920sub update {
2469 my ($self) = @_; 2921 my ($self) = @_;
2470 2922
2471 delete $self->{knob_w}; 2923 delete $self->{knob_w};
2472 $self->SUPER::update; 2924 $self->SUPER::update;
… …
2519 glDisable GL_TEXTURE_2D; 2971 glDisable GL_TEXTURE_2D;
2520} 2972}
2521 2973
2522############################################################################# 2974#############################################################################
2523 2975
2524package CFClient::UI::ValSlider; 2976package CFPlus::UI::ValSlider;
2525 2977
2526our @ISA = CFClient::UI::HBox::; 2978our @ISA = CFPlus::UI::HBox::;
2527 2979
2528sub new { 2980sub new {
2529 my ($class, %arg) = @_; 2981 my ($class, %arg) = @_;
2530 2982
2531 my $range = delete $arg{range}; 2983 my $range = delete $arg{range};
2532 2984
2533 my $self = $class->SUPER::new ( 2985 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2986 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2987 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift }, 2988 to_value => sub { shift },
2537 from_value => sub { shift }, 2989 from_value => sub { shift },
2538 %arg, 2990 %arg,
2539 ); 2991 );
2540 2992
… …
2560sub set_range { shift->{slider}->set_range (@_) } 3012sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) } 3013sub set_value { shift->{slider}->set_value (@_) }
2562 3014
2563############################################################################# 3015#############################################################################
2564 3016
2565package CFClient::UI::TextScroller; 3017package CFPlus::UI::TextScroller;
2566 3018
2567our @ISA = CFClient::UI::HBox::; 3019our @ISA = CFPlus::UI::HBox::;
2568 3020
2569use CFClient::OpenGL; 3021use CFPlus::OpenGL;
2570 3022
2571sub new { 3023sub new {
2572 my $class = shift; 3024 my $class = shift;
2573 3025
2574 my $self = $class->SUPER::new ( 3026 my $self = $class->SUPER::new (
2575 fontsize => 1, 3027 fontsize => 1,
2576 can_events => 0, 3028 can_events => 1,
2577 indent => 0, 3029 indent => 0,
2578 #font => default_font 3030 #font => default_font
2579 @_, 3031 @_,
2580 3032
2581 layout => (new CFClient::Layout), 3033 layout => (new CFPlus::Layout),
2582 par => [], 3034 par => [],
3035 max_par => 0,
2583 height => 0, 3036 height => 0,
2584 children => [ 3037 children => [
2585 (new CFClient::UI::Empty expand => 1), 3038 (new CFPlus::UI::Empty expand => 1),
2586 (new CFClient::UI::Slider vertical => 1), 3039 (new CFPlus::UI::Slider vertical => 1),
2587 ], 3040 ],
2588 ); 3041 );
2589 3042
2590 $self->{children}[1]->connect (changed => sub { $self->update }); 3043 $self->{children}[1]->connect (changed => sub { $self->update });
2591 3044
… …
2621 3074
2622 $self->reflow; 3075 $self->reflow;
2623 3076
2624 local $self->{children} = [$empty, $slider]; 3077 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 3078 $self->SUPER::invoke_size_allocate ($w, $h)
3079}
3080
3081sub invoke_mouse_wheel {
3082 my ($self, $ev) = @_;
3083
3084 return 0 unless $ev->{dy}; # only vertical movements
3085
3086 $self->{children}[1]->emit (mouse_wheel => $ev);
3087
3088 1
2626} 3089}
2627 3090
2628sub get_layout { 3091sub get_layout {
2629 my ($self, $para) = @_; 3092 my ($self, $para) = @_;
2630 3093
… …
2658 3121
2659 # todo: base offset on lines or so, not on pixels 3122 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset); 3123 $self->{children}[1]->set_value ($offset);
2661} 3124}
2662 3125
3126sub current_paragraph {
3127 my ($self) = @_;
3128
3129 $self->{top_paragraph} - 1
3130}
3131
3132sub scroll_to {
3133 my ($self, $para) = @_;
3134
3135 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3136
3137 $self->{scroll_to} = $para;
3138 $self->update;
3139}
3140
2663sub clear { 3141sub clear {
2664 my ($self) = @_; 3142 my ($self) = @_;
2665 3143
2666 my (undef, undef, @other) = @{ $self->{children} }; 3144 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other; 3145 $self->remove ($_) for @other;
… …
2670 $self->{height} = 0; 3148 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3149 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 3150}
2673 3151
2674sub add_paragraph { 3152sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 3153 my $self = shift;
2676 3154
2677 my ($text, @w) = ref $para ? @$para : $para; 3155 for my $para (@_) {
2678
2679 $para = { 3156 $para = {
3157 fg => [1, 1, 1, 1],
3158 indent => 0,
3159 markup => "",
3160 widget => [],
3161 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 3162 w => 1e10,
2681 wrapped => 1, 3163 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 3164 };
2687 3165
2688 $self->add (@w) if @w; 3166 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 3167 push @{$self->{par}}, $para;
3168 }
3169
3170 if (my $max = $self->{max_par}) {
3171 shift @{$self->{par}} while @{$self->{par}} > $max;
3172 }
2690 3173
2691 $self->{need_reflow}++; 3174 $self->{need_reflow}++;
2692 $self->update; 3175 $self->update;
2693} 3176}
2694 3177
2695sub scroll_to_bottom { 3178sub scroll_to_bottom {
2696 my ($self) = @_; 3179 my ($self) = @_;
2697 3180
2698 $self->{scroll_to_bottom} = 1; 3181 $self->{scroll_to} = $#{$self->{par}};
2699 $self->update; 3182 $self->update;
2700} 3183}
2701 3184
3185sub force_uptodate {
3186 my ($self) = @_;
3187
3188 if (delete $self->{need_reflow}) {
3189 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3190
3191 my $height = 0;
3192
3193 for my $para (@{$self->{par}}) {
3194 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3195 my $layout = $self->get_layout ($para);
3196 my ($w, $h) = $layout->size;
3197
3198 $para->{w} = $w + $para->{indent};
3199 $para->{h} = $h;
3200 $para->{wrapped} = $layout->has_wrapped;
3201 }
3202
3203 $para->{y} = $height;
3204 $height += $para->{h};
3205 }
3206
3207 $self->{height} = $height;
3208 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3209
3210 delete $self->{texture};
3211 }
3212
3213 if (my $paridx = delete $self->{scroll_to}) {
3214 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3215 }
3216}
3217
2702sub update { 3218sub update {
2703 my ($self) = @_; 3219 my ($self) = @_;
2704 3220
2705 $self->SUPER::update; 3221 $self->SUPER::update;
2706 3222
2707 return unless $self->{h} > 0; 3223 return unless $self->{h} > 0;
2708 3224
2709 delete $self->{texture}; 3225 delete $self->{texture};
2710 3226
2711 $ROOT->on_post_alloc ($self => sub { 3227 $ROOT->on_post_alloc ($self => sub {
3228 $self->force_uptodate;
3229
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3230 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713 3231
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 { 3232 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742 glClearColor 0, 0, 0, 0; 3233 glClearColor 0, 0, 0, 0;
2743 glClear GL_COLOR_BUFFER_BIT; 3234 glClear GL_COLOR_BUFFER_BIT;
2744 3235
3236 package CFPlus::UI::Base;
3237 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3238 (0, 0, $self->{w}, $self->{h});
3239
3240 my $top = int $self->{children}[1]{range}[0];
3241
3242 my $paridx = 0;
3243 my $top_paragraph;
2745 my $top = int $self->{children}[1]{range}[0]; 3244 my $top = int $self->{children}[1]{range}[0];
2746 3245
2747 my $y0 = $top; 3246 my $y0 = $top;
2748 my $y1 = $top + $H; 3247 my $y1 = $top + $H;
2749 3248
2750 my $y = 0;
2751
2752 for my $para (@{$self->{par}}) { 3249 for my $para (@{$self->{par}}) {
2753 my $h = $para->{h}; 3250 my $h = $para->{h};
3251 my $y = $para->{y};
2754 3252
2755 if ($y0 < $y + $h && $y < $y1) { 3253 if ($y0 < $y + $h && $y < $y1) {
2756
2757 my $layout = $self->get_layout ($para); 3254 my $layout = $self->get_layout ($para);
2758 3255
2759 $layout->render ($para->{indent}, $y - $y0); 3256 $layout->render ($para->{indent}, $y - $y0);
2760 3257
2761 if (my @w = @{ $para->{widget} }) { 3258 if (my @w = @{ $para->{widget} }) {
… …
2770 $_->draw; 3267 $_->draw;
2771 } 3268 }
2772 } 3269 }
2773 } 3270 }
2774 3271
2775 $y += $h; 3272 $paridx++;
3273 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3274 }
3275
3276 $self->{top_paragraph} = $top_paragraph;
2777 }; 3277 };
2778 }); 3278 });
2779} 3279}
2780 3280
2781sub reconfigure { 3281sub reconfigure {
… …
2799 $self->{children}[1]->draw; 3299 $self->{children}[1]->draw;
2800} 3300}
2801 3301
2802############################################################################# 3302#############################################################################
2803 3303
2804package CFClient::UI::Animator; 3304package CFPlus::UI::Animator;
2805 3305
2806use CFClient::OpenGL; 3306use CFPlus::OpenGL;
2807 3307
2808our @ISA = CFClient::UI::Bin::; 3308our @ISA = CFPlus::UI::Bin::;
2809 3309
2810sub moveto { 3310sub moveto {
2811 my ($self, $x, $y) = @_; 3311 my ($self, $x, $y) = @_;
2812 3312
2813 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3313 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2841 glPopMatrix; 3341 glPopMatrix;
2842} 3342}
2843 3343
2844############################################################################# 3344#############################################################################
2845 3345
2846package CFClient::UI::Flopper; 3346package CFPlus::UI::Flopper;
2847 3347
2848our @ISA = CFClient::UI::Button::; 3348our @ISA = CFPlus::UI::Button::;
2849 3349
2850sub new { 3350sub new {
2851 my $class = shift; 3351 my $class = shift;
2852 3352
2853 my $self = $class->SUPER::new ( 3353 my $self = $class->SUPER::new (
… …
2865 $self->{other}->toggle_visibility; 3365 $self->{other}->toggle_visibility;
2866} 3366}
2867 3367
2868############################################################################# 3368#############################################################################
2869 3369
2870package CFClient::UI::Tooltip; 3370package CFPlus::UI::Tooltip;
2871 3371
2872our @ISA = CFClient::UI::Bin::; 3372our @ISA = CFPlus::UI::Bin::;
2873 3373
2874use CFClient::OpenGL; 3374use CFPlus::OpenGL;
2875 3375
2876sub new { 3376sub new {
2877 my $class = shift; 3377 my $class = shift;
2878 3378
2879 $class->SUPER::new ( 3379 $class->SUPER::new (
… …
2882 ) 3382 )
2883} 3383}
2884 3384
2885sub set_tooltip_from { 3385sub set_tooltip_from {
2886 my ($self, $widget) = @_; 3386 my ($self, $widget) = @_;
3387
3388 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3389 if $widget->{tooltip} =~ /^#(.*)$/;
2887 3390
2888 my $tooltip = $widget->{tooltip}; 3391 my $tooltip = $widget->{tooltip};
2889 3392
2890 if ($ENV{CFPLUS_DEBUG} & 2) { 3393 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n" 3394 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2895 } 3398 }
2896 3399
2897 $tooltip =~ s/^\n+//; 3400 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//; 3401 $tooltip =~ s/\n+$//;
2899 3402
2900 $self->add (new CFClient::UI::Label 3403 $self->add (new CFPlus::UI::Label
2901 markup => $tooltip, 3404 markup => $tooltip,
2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3405 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903 fontsize => 0.8, 3406 fontsize => 0.8,
2904 fg => [0, 0, 0, 1], 3407 style => 1, # FLAG_INVERSE
2905 ellipsise => 0, 3408 ellipsise => 0,
2906 font => ($widget->{tooltip_font} || $::FONT_PROP), 3409 font => ($widget->{tooltip_font} || $::FONT_PROP),
2907 ); 3410 );
2908} 3411}
2909 3412
… …
2928 3431
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3432 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3433 my $widget = $self->{owner}
2931 or return; 3434 or return;
2932 3435
3436 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3437 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3438
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3439 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3440 if $x + $self->{w} > $self->{root}{w};
2937 3441
2938 $self->move_abs ($x, $y); 3442 $self->move_abs ($x, $y);
3443 } else {
3444 $self->hide;
3445 }
2939 }); 3446 });
2940} 3447}
2941 3448
2942sub _draw { 3449sub _draw {
2943 my ($self) = @_; 3450 my ($self) = @_;
… …
2967 $self->SUPER::_draw; 3474 $self->SUPER::_draw;
2968} 3475}
2969 3476
2970############################################################################# 3477#############################################################################
2971 3478
2972package CFClient::UI::Face; 3479package CFPlus::UI::Face;
2973 3480
2974our @ISA = CFClient::UI::Base::; 3481our @ISA = CFPlus::UI::DrawBG::;
2975 3482
2976use CFClient::OpenGL; 3483use CFPlus::OpenGL;
2977 3484
2978sub new { 3485sub new {
2979 my $class = shift; 3486 my $class = shift;
2980 3487
2981 my $self = $class->SUPER::new ( 3488 my $self = $class->SUPER::new (
3489 size_w => 32,
3490 size_h => 8,
2982 aspect => 1, 3491 aspect => 1,
2983 can_events => 0, 3492 can_events => 0,
2984 @_, 3493 @_,
2985 ); 3494 );
2986 3495
2987 if ($self->{anim} && $self->{animspeed}) { 3496 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self); 3497 CFPlus::weaken (my $widget = $self);
2989 3498
3499 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3500 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2990 $self->{timer} = Event->timer ( 3501 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1, 3502 parked => 1,
2993 interval => $self->{animspeed},
2994 cb => sub { 3503 cb => sub {
3504 return unless $::CONN && $widget;
3505
2995 ++$widget->{frame}; 3506 ++$widget->{frame};
3507 $widget->update_face;
2996 $widget->update; 3508 $widget->update;
3509
3510 $widget->update_timer;
2997 }, 3511 },
2998 ); 3512 );
3513
3514 $self->update_face;
3515 $self->update_timer;
2999 } 3516 }
3000 3517
3001 $self 3518 $self
3002} 3519}
3003 3520
3521sub update_timer {
3522 my ($self) = @_;
3523
3524 return unless $self->{timer};
3525
3526 if ($self->{visible}) {
3527 $self->{timer}->at (
3528 $self->{anim_start}
3529 + $self->{animspeed}
3530 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3531 );
3532 $self->{timer}->start;
3533 } else {
3534 $self->{timer}->stop;
3535 }
3536}
3537
3538sub update_face {
3539 my ($self) = @_;
3540
3541 return unless $::CONN;
3542
3543 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if ($anim && @$anim) {
3545 delete $self->{wait_face};
3546 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 }
3548 }
3549}
3550
3004sub size_request { 3551sub size_request {
3005 (32, 8) 3552 my ($self) = @_;
3553
3554 if ($::CONN) {
3555 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3556 if (my $tex = $::CONN->{texture}[$faceid]) {
3557 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3558 } else {
3559 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3560 $self->realloc;
3561 });
3562 }
3563 }
3564 }
3565
3566 ($self->{size_w} || 8, $self->{size_h} || 8)
3006} 3567}
3007 3568
3008sub update { 3569sub update {
3009 my ($self) = @_; 3570 my ($self) = @_;
3010 3571
3011 return unless $self->{visible}; 3572 return unless $self->{visible};
3012 3573
3013 $self->SUPER::update; 3574 $self->SUPER::update;
3014} 3575}
3015 3576
3577sub invoke_visibility_change {
3578 my ($self) = @_;
3579
3580 $self->update_timer;
3581
3582 0
3583}
3584
3016sub _draw { 3585sub _draw {
3017 my ($self) = @_; 3586 my ($self) = @_;
3018 3587
3019 return unless $::CONN; 3588 return unless $::CONN;
3020 3589
3021 my $face; 3590 $self->SUPER::_draw;
3022 3591
3023 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}]; 3592 my $faceid = $::CONN->{faceid}[$self->{face}]
3025 3593 or return;
3026 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim;
3028 }
3029 3594
3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3595 my $tex = $::CONN->{texture}[$faceid];
3031 3596
3032 if ($tex) { 3597 if ($tex) {
3033 glEnable GL_TEXTURE_2D; 3598 glEnable GL_TEXTURE_2D;
3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035 glColor 0, 0, 0, 1; 3600 glColor 0, 0, 0, 1;
… …
3039} 3604}
3040 3605
3041sub destroy { 3606sub destroy {
3042 my ($self) = @_; 3607 my ($self) = @_;
3043 3608
3044 $self->{timer}->cancel 3609 (delete $self->{timer})->cancel
3045 if $self->{timer}; 3610 if $self->{timer};
3046 3611
3047 $self->SUPER::destroy; 3612 $self->SUPER::destroy;
3048} 3613}
3049 3614
3050############################################################################# 3615#############################################################################
3051 3616
3052package CFClient::UI::Buttonbar; 3617package CFPlus::UI::Buttonbar;
3053 3618
3054our @ISA = CFClient::UI::HBox::; 3619our @ISA = CFPlus::UI::HBox::;
3055 3620
3056# TODO: should actualyl wrap buttons and other goodies. 3621# TODO: should actually wrap buttons and other goodies.
3057 3622
3058############################################################################# 3623#############################################################################
3059 3624
3060package CFClient::UI::Menu; 3625package CFPlus::UI::Menu;
3061 3626
3062our @ISA = CFClient::UI::FancyFrame::; 3627our @ISA = CFPlus::UI::Toplevel::;
3063 3628
3064use CFClient::OpenGL; 3629use CFPlus::OpenGL;
3065 3630
3066sub new { 3631sub new {
3067 my $class = shift; 3632 my $class = shift;
3068 3633
3069 my $self = $class->SUPER::new ( 3634 my $self = $class->SUPER::new (
3070 items => [], 3635 items => [],
3071 z => 100, 3636 z => 100,
3072 @_, 3637 @_,
3073 ); 3638 );
3074 3639
3075 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3640 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076 3641
3077 for my $item (@{ $self->{items} }) { 3642 for my $item (@{ $self->{items} }) {
3078 my ($widget, $cb, $tooltip) = @$item; 3643 my ($widget, $cb, $tooltip) = @$item;
3079 3644
3080 # handle various types of items, only text for now 3645 # handle various types of items, only text for now
3081 if (!ref $widget) { 3646 if (!ref $widget) {
3082 if ($widget =~ /\t/) { 3647 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2; 3648 my ($left, $right) = split /\t/, $widget, 2;
3084 3649
3085 $widget = new CFClient::UI::HBox 3650 $widget = new CFPlus::UI::HBox
3086 can_hover => 1, 3651 can_hover => 1,
3087 can_events => 1, 3652 can_events => 1,
3088 tooltip => $tooltip, 3653 tooltip => $tooltip,
3089 children => [ 3654 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1), 3655 (new CFPlus::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1), 3656 (new CFPlus::UI::Label markup => $right, align => +1),
3092 ], 3657 ],
3093 ; 3658 ;
3094 3659
3095 } else { 3660 } else {
3096 $widget = new CFClient::UI::Label 3661 $widget = new CFPlus::UI::Label
3097 can_hover => 1, 3662 can_hover => 1,
3098 can_events => 1, 3663 can_events => 1,
3099 markup => $widget, 3664 markup => $widget,
3100 tooltip => $tooltip; 3665 tooltip => $tooltip;
3101 } 3666 }
… …
3149 1 3714 1
3150} 3715}
3151 3716
3152############################################################################# 3717#############################################################################
3153 3718
3154package CFClient::UI::Multiplexer; 3719package CFPlus::UI::Multiplexer;
3155 3720
3156our @ISA = CFClient::UI::Container::; 3721our @ISA = CFPlus::UI::Container::;
3157 3722
3158sub new { 3723sub new {
3159 my $class = shift; 3724 my $class = shift;
3160 3725
3161 my $self = $class->SUPER::new ( 3726 my $self = $class->SUPER::new (
… …
3222 $self->{current}->draw; 3787 $self->{current}->draw;
3223} 3788}
3224 3789
3225############################################################################# 3790#############################################################################
3226 3791
3227package CFClient::UI::Notebook; 3792package CFPlus::UI::Notebook;
3228 3793
3229our @ISA = CFClient::UI::VBox::; 3794our @ISA = CFPlus::UI::VBox::;
3230 3795
3231sub new { 3796sub new {
3232 my $class = shift; 3797 my $class = shift;
3233 3798
3234 my $self = $class->SUPER::new ( 3799 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar), 3800 buttonbar => (new CFPlus::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3801 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self 3802 # filter => # will be put between multiplexer and $self
3238 @_, 3803 @_,
3239 ); 3804 );
3240 3805
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3806 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3245} 3810}
3246 3811
3247sub add { 3812sub add {
3248 my ($self, $title, $widget, $tooltip) = @_; 3813 my ($self, $title, $widget, $tooltip) = @_;
3249 3814
3250 Scalar::Util::weaken $self; 3815 CFPlus::weaken $self;
3251 3816
3252 $self->{buttonbar}->add (new CFClient::UI::Button 3817 $self->{buttonbar}->add (new CFPlus::UI::Button
3253 markup => $title, 3818 markup => $title,
3254 tooltip => $tooltip, 3819 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) }, 3820 on_activate => sub { $self->set_current_page ($widget) },
3256 ); 3821 );
3257 3822
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3836 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3837}
3273 3838
3274############################################################################# 3839#############################################################################
3275 3840
3276package CFClient::UI::Combobox; 3841package CFPlus::UI::Selector;
3277 3842
3278use utf8; 3843use utf8;
3279 3844
3280our @ISA = CFClient::UI::Button::; 3845our @ISA = CFPlus::UI::Button::;
3281 3846
3282sub new { 3847sub new {
3283 my $class = shift; 3848 my $class = shift;
3284 3849
3285 my $self = $class->SUPER::new ( 3850 my $self = $class->SUPER::new (
… …
3302 my ($value, $title, $tooltip) = @$_; 3867 my ($value, $title, $tooltip) = @$_;
3303 3868
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3869 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 } 3870 }
3306 3871
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3872 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308} 3873}
3309 3874
3310sub _set_value { 3875sub _set_value {
3311 my ($self, $value) = @_; 3876 my ($self, $value) = @_;
3312 3877
… …
3327 $self->emit (changed => $value); 3892 $self->emit (changed => $value);
3328} 3893}
3329 3894
3330############################################################################# 3895#############################################################################
3331 3896
3332package CFClient::UI::Statusbox; 3897package CFPlus::UI::Statusbox;
3333 3898
3334our @ISA = CFClient::UI::VBox::; 3899our @ISA = CFPlus::UI::VBox::;
3335 3900
3336sub new { 3901sub new {
3337 my $class = shift; 3902 my $class = shift;
3338 3903
3339 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3340 fontsize => 0.8, 3905 fontsize => 0.8,
3341 @_, 3906 @_,
3342 ); 3907 );
3343 3908
3344 Scalar::Util::weaken (my $this = $self); 3909 CFPlus::weaken (my $this = $self);
3345 3910
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3911 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347 3912
3348 $self 3913 $self
3349} 3914}
… …
3351sub reorder { 3916sub reorder {
3352 my ($self) = @_; 3917 my ($self) = @_;
3353 my $NOW = Time::HiRes::time; 3918 my $NOW = Time::HiRes::time;
3354 3919
3355 # freeze display when hovering over any label 3920 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner} 3921 return if $CFPlus::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3922 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} }; 3923 values %{ $self->{item} };
3359 3924
3360 while (my ($k, $v) = each %{ $self->{item} }) { 3925 while (my ($k, $v) = each %{ $self->{item} }) {
3361 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3926 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362 } 3927 }
… …
3383 for ($short) { 3948 for ($short) {
3384 s/^\s+//; 3949 s/^\s+//;
3385 s/\s+/ /g; 3950 s/\s+/ /g;
3386 } 3951 }
3387 3952
3388 new CFClient::UI::Label 3953 new CFPlus::UI::Label
3389 markup => $short, 3954 markup => $short,
3390 tooltip => $item->{tooltip}, 3955 tooltip => $item->{tooltip},
3391 tooltip_font => $::FONT_PROP, 3956 tooltip_font => $::FONT_PROP,
3392 tooltip_width => 0.67, 3957 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize}, 3958 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3472 $self->SUPER::destroy; 4037 $self->SUPER::destroy;
3473} 4038}
3474 4039
3475############################################################################# 4040#############################################################################
3476 4041
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; 4042package CFPlus::UI::Root;
3642 4043
3643our @ISA = CFClient::UI::Container::; 4044our @ISA = CFPlus::UI::Container::;
3644 4045
3645use List::Util qw(min max); 4046use List::Util qw(min max);
3646 4047
3647use CFClient::OpenGL; 4048use CFPlus::OpenGL;
3648 4049
3649sub new { 4050sub new {
3650 my $class = shift; 4051 my $class = shift;
3651 4052
3652 my $self = $class->SUPER::new ( 4053 my $self = $class->SUPER::new (
3653 visible => 1, 4054 visible => 1,
3654 @_, 4055 @_,
3655 ); 4056 );
3656 4057
3657 Scalar::Util::weaken ($self->{root} = $self); 4058 CFPlus::weaken ($self->{root} = $self);
3658 4059
3659 $self 4060 $self
3660} 4061}
3661 4062
3662sub size_request { 4063sub size_request {
… …
3831 $h = 0 if $h < 0; 4232 $h = 0 if $h < 0;
3832 4233
3833 $w = max $widget->{min_w}, $w; 4234 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 4235 $h = max $widget->{min_h}, $h;
3835 4236
4237# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4238# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4239
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4240 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4241 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 4242
3839 $w = int $w + 0.5; 4243 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 4244 $h = int $h + 0.5;
… …
3853 4257
3854 while ($self->{post_alloc_hook}) { 4258 while ($self->{post_alloc_hook}) {
3855 $_->() 4259 $_->()
3856 for values %{delete $self->{post_alloc_hook}}; 4260 for values %{delete $self->{post_alloc_hook}};
3857 } 4261 }
3858
3859 4262
3860 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4263 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862 glClear GL_COLOR_BUFFER_BIT; 4265 glClear GL_COLOR_BUFFER_BIT;
3863 4266
… …
3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4269 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867 glMatrixMode GL_MODELVIEW; 4270 glMatrixMode GL_MODELVIEW;
3868 glLoadIdentity; 4271 glLoadIdentity;
3869 4272
3870 { 4273 {
3871 package CFClient::UI::Base; 4274 package CFPlus::UI::Base;
3872 4275
3873 ($draw_x, $draw_y, $draw_w, $draw_h) = 4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h}); 4277 (0, 0, $self->{w}, $self->{h});
3875 }
3876 4278
3877 $self->_draw; 4279 $self->_draw;
4280 }
3878} 4281}
3879 4282
3880############################################################################# 4283#############################################################################
3881 4284
3882package CFClient::UI; 4285package CFPlus::UI;
3883 4286
3884$ROOT = new CFClient::UI::Root; 4287$ROOT = new CFPlus::UI::Root;
3885$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4288$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886 4289
38871 42901
3888 4291

Diff Legend

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