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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
… …
452 490
453 $FOCUS->emit ("focus_out") if $FOCUS; 491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
474} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 595# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 600
583sub _draw { 601sub _draw {
584 my ($self) = @_; 602 my ($self) = @_;
585 603
586 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
587} 605}
588 606
589sub DESTROY { 607sub DESTROY {
590 my ($self) = @_; 608 my ($self) = @_;
591 609
592 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
593 611
594 eval { $self->destroy }; 612 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
596} 616}
597 617
598############################################################################# 618#############################################################################
599 619
600package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
601 621
602our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
603 623
604use strict; 624use strict;
605use CFClient::OpenGL; 625use CFPlus::OpenGL;
606 626
607sub new { 627sub new {
608 my $class = shift; 628 my $class = shift;
609 629
610 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
641 } 661 }
642} 662}
643 663
644############################################################################# 664#############################################################################
645 665
646package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
647 667
648our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
649 669
650sub new { 670sub new {
651 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
653} 673}
… …
660 680
661sub draw { } 681sub draw { }
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Container; 685package CFPlus::UI::Container;
666 686
667our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
668 688
669sub new { 689sub new {
670 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
671 691
672 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
676 can_events => 0, 696 can_events => 0,
677 %arg, 697 %arg,
678 ); 698 );
679 699
680 $self->add (@$children) 700 $self->add (@$children)
681 if $children; 701 if $children && @$children;
682 702
683 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
684} 712}
685 713
686sub add { 714sub add {
687 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
688 716
689 $_->set_parent ($self) 717 $_->set_parent ($self)
690 for @widgets; 718 for @widgets;
691 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 721 use sort 'stable';
693 722
694 $self->{children} = [ 723 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
697 ]; 726 ];
698 727
699 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
700} 733}
701 734
702sub children { 735sub children {
703 @{ $_[0]{children} } 736 @{ $_[0]{children} }
704} 737}
705 738
706sub remove { 739sub remove {
707 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
708 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
709 delete $child->{parent}; 745 delete $child->{parent};
710 $child->hide; 746 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
713 749
714 $self->realloc; 750 $self->realloc;
715} 751}
716 752
717sub clear { 753sub clear {
718 my ($self) = @_; 754 my ($self) = @_;
719 755
720 my $children = delete $self->{children}; 756 my $children = $self->{children};
721 $self->{children} = []; 757 $self->{children} = [];
722 758
723 for (@$children) { 759 for (@$children) {
724 delete $_->{parent}; 760 delete $_->{parent};
725 $_->hide; 761 $_->hide;
… …
745} 781}
746 782
747sub _draw { 783sub _draw {
748 my ($self) = @_; 784 my ($self) = @_;
749 785
750 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
751} 787}
752 788
753############################################################################# 789#############################################################################
754 790
755package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
756 792
757our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
758 794
759sub new { 795sub new {
760 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
761 797
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 799
764 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
765} 801}
766 802
767sub add { 803sub add {
768 my ($self, $child) = @_; 804 my ($self, $child) = @_;
769 805
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
771 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
772} 808}
773 809
774sub remove { 810sub remove {
775 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
776 812
777 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
778 814
779 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 816 unless @{$self->{children}};
781} 817}
782 818
783sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
784 820
… …
796 832
797############################################################################# 833#############################################################################
798 834
799# back-buffered drawing area 835# back-buffered drawing area
800 836
801package CFClient::UI::Window; 837package CFPlus::UI::Window;
802 838
803our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
804 840
805use CFClient::OpenGL; 841use CFPlus::OpenGL;
806 842
807sub new { 843sub new {
808 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
809 845
810 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
832} 868}
833 869
834sub render_child { 870sub render_child {
835 my ($self) = @_; 871 my ($self) = @_;
836 872
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
840 876
841 { 877 {
842 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
843 879
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
846 } 884 }
847
848 $self->_render;
849 }; 885 };
850} 886}
851 887
852sub _draw { 888sub _draw {
853 my ($self) = @_; 889 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 890
857 my $tex = $self->{texture} 891 my $tex = $self->{texture}
858 or return; 892 or return;
859 893
860 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
863 897
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
865 899
866 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
867} 901}
868 902
869############################################################################# 903#############################################################################
870 904
871package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
872 906
907use List::Util qw(min max);
908
873our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
874 910
875sub new { 911sub new {
876 my $class = shift; 912 my $class = shift;
877 913
878 $class->SUPER::new ( 914 $class->SUPER::new (
… …
885sub size_request { 921sub size_request {
886 my ($self) = @_; 922 my ($self) = @_;
887 923
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 925
890 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
892 928
893 ($w, $h) 929 ($w, $h)
894} 930}
895 931
896sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
908} 944}
909 945
910sub set_offset { 946sub set_offset {
911 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
912 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
915 955
956 $self->emit (changed => $x, $y);
916 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
917} 977}
918 978
919# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 980sub coord2local {
921 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
937 997
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1000 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1002 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1004 }
945} 1005}
946 1006
947sub _render { 1007sub _render {
948 my ($self) = @_; 1008 my ($self) = @_;
949 1009
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1012
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1014
955 $self->SUPER::_render; 1015 $self->SUPER::_render;
956} 1016}
957 1017
958############################################################################# 1018#############################################################################
959 1019
960package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
961 1021
962our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
963 1023
964sub new { 1024sub new {
965 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
966 1026
967 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
968 1028
969 my $self; 1029 my $self;
970 1030
971 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
972 vertical => 1, 1045 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1047 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1050 },
977 ; 1051 ;
978 1052
979 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
981 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
982 %arg, 1061 %arg,
983 ); 1062 );
984 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
986 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
987 1088
988 $self 1089 $self
989} 1090}
990
991#TODO# update range on size_allocate depending on child
992 1091
993sub add { 1092sub add {
994 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
995 1094
996 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
997} 1096}
998 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
999sub update_slider { 1102sub update_slider {
1000 my ($self) = @_; 1103 my ($self) = @_;
1001 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1110
1005sub update { 1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1006 my ($self) = @_; 1133 my ($self, $ev) = @_;
1007 1134
1008 $self->SUPER::update; 1135 $self->grab_focus;
1009 1136
1010 $self->update_slider; 1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1011} 1189}
1012 1190
1013sub invoke_size_allocate { 1191sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1015 1193
1016 $self->update_slider; 1194 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1196}
1020 1197
1021############################################################################# 1198#############################################################################
1022 1199
1023package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1024 1201
1025our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1026 1203
1027use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1028 1205
1029sub new { 1206sub new {
1030 my $class = shift; 1207 my $class = shift;
1031 1208
1032 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1059} 1236}
1060 1237
1061############################################################################# 1238#############################################################################
1062 1239
1063package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1064 1241
1065our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1066 1243
1067use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1068 1345
1069my $bg = 1346my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1072 1349
1073my @border = 1350my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1076 1357
1077sub new { 1358sub new {
1078 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1079 1360
1080 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1363 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1364 border => 0.6,
1084 can_events => 1, 1365 can_events => 1,
1085 min_w => 16, 1366 min_w => 64,
1086 min_h => 16, 1367 min_h => 32,
1087 %arg, 1368 %arg,
1088 ); 1369 );
1089 1370
1090 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1372 align => 0,
1092 valign => 1, 1373 valign => 1,
1093 text => $self->{title}, 1374 text => $self->{title},
1094 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1095 if exists $self->{title}; 1376 if exists $self->{title};
1096 1377
1097 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1379 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1381 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1382 on_activate => sub { $self->emit ("delete") };
1102 1383
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1385 }
1105 1386
1106 $self 1387 $self
1107} 1388}
1108 1389
1109sub add { 1390sub add {
1110 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1111 1392
1112 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1396}
1116 1397
1117sub border { 1398sub border {
1118 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1119} 1400}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1509
1229 ! ! $self->{motion} 1510 ! ! $self->{motion}
1230} 1511}
1231 1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1519}
1520
1232sub _draw { 1521sub _draw {
1233 my ($self) = @_; 1522 my ($self) = @_;
1234 1523
1235 my $child = $self->{children}[0]; 1524 my $child = $self->{children}[0];
1236 1525
… …
1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242 1531
1243 my $border = $self->border; 1532 my $border = $self->border;
1244 1533
1245 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1246 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250 1553
1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1253 1556
1254 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1273 if $self->{close_button}; 1576 if $self->{close_button};
1274} 1577}
1275 1578
1276############################################################################# 1579#############################################################################
1277 1580
1278package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1279 1582
1280our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1281 1584
1282use List::Util qw(max sum); 1585use List::Util qw(max sum);
1283 1586
1284use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1285 1588
1286sub new { 1589sub new {
1287 my $class = shift; 1590 my $class = shift;
1288 1591
1289 $class->SUPER::new ( 1592 $class->SUPER::new (
1290 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1291 @_, 1595 @_,
1292 ) 1596 )
1293} 1597}
1294 1598
1295sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297}
1298
1299sub add { 1599sub add {
1300 my ($self, $x, $y, $child) = @_; 1600 my ($self, @widgets) = @_;
1301 1601
1302 $child->set_parent ($self); 1602 for my $child (@widgets) {
1303 $self->{children}[$y][$x] = $child; 1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1304 1606
1305 $self->realloc; 1607 $self->SUPER::add (@widgets);
1306} 1608}
1307 1609
1308sub remove { 1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{row} = $row;
1619 $child->{col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1309 my ($self, $child) = @_; 1628 my ($self) = @_;
1310 1629
1311 # TODO: not yet implemented 1630 my (@w, @h);
1312}
1313
1314# TODO: move to container class maybe? send children a signal on removal?
1315sub clear {
1316 my ($self) = @_;
1317 1631
1318 my @children = $self->children; 1632 my @children = $self->children;
1319 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1320 1643 }
1321 for (@children) {
1322 delete $_->{parent};
1323 $_->hide;
1324 }
1325 1644
1326 $self->realloc; 1645 # second pass, rows
1327} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1328
1329sub get_wh {
1330 my ($self) = @_;
1331
1332 my (@w, @h);
1333
1334 for my $y (0 .. $#{$self->{children}}) {
1335 my $row = $self->{children}[$y]
1336 or next;
1337
1338 for my $x (0 .. $#$row) {
1339 my $widget = $row->[$x]
1340 or next;
1341 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1342 1648
1343 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1344 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345 } 1653 }
1346 } 1654 }
1347 1655
1348 (\@w, \@h) 1656 (\@w, \@h)
1349} 1657}
… …
1365 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1366 1674
1367 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1369 1677
1370 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1371 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1374 1682
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1684
1379 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1380 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1381 1694
1382 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383 1697
1384 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1385 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1386 or next;
1387 1700
1388 my $x = 0; 1701 $widget->configure (
1389 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390 1704 );
1391 for my $c (0 .. $#$row) { 1705 }
1392 my $col_w = $ws->[$c];
1393 1706
1394 if (my $widget = $row->[$c]) { 1707 1
1395 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1396 }
1397 1709
1398 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1399 } 1737 }
1738 }
1400 1739
1401 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1402 } 1771 }
1403 1772
1404 1 1773 1
1405} 1774}
1406 1775
1407sub find_widget {
1408 my ($self, $x, $y) = @_;
1409
1410 $x -= $self->{x};
1411 $y -= $self->{y};
1412
1413 my $res;
1414
1415 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416 $res = $_->find_widget ($x, $y)
1417 and return $res;
1418 }
1419
1420 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421}
1422
1423sub _draw {
1424 my ($self) = @_;
1425
1426 for (grep $_, @{$self->{children}}) {
1427 $_->draw for grep $_, @$_;
1428 }
1429}
1430
1431############################################################################# 1776#############################################################################
1432 1777
1433package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1434 1779
1435our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1436 1781
1437sub size_request { 1782sub size_request {
1438 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1439 1786
1440 $self->{vertical} 1787 $self->{vertical}
1441 ? ( 1788 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1444 ) 1791 )
1445 : ( 1792 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1448 ) 1795 )
1449} 1796}
1450 1797
1451sub invoke_size_allocate { 1798sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1473 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1821 for 0 .. $#children;
1475 } 1822 }
1476 } 1823 }
1477 1824
1478 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1479 1826
1480 my $pos = 0; 1827 my $pos = 0;
1481 for (0 .. $#children) { 1828 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1835 1
1489} 1836}
1490 1837
1491############################################################################# 1838#############################################################################
1492 1839
1493package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1494 1841
1495our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1496 1843
1497sub new { 1844sub new {
1498 my $class = shift; 1845 my $class = shift;
1499 1846
1500 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1503 ) 1850 )
1504} 1851}
1505 1852
1506############################################################################# 1853#############################################################################
1507 1854
1508package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1509 1856
1510our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1511 1858
1512sub new { 1859sub new {
1513 my $class = shift; 1860 my $class = shift;
1514 1861
1515 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1518 ) 1865 )
1519} 1866}
1520 1867
1521############################################################################# 1868#############################################################################
1522 1869
1523package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1524 1871
1525our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1526 1873
1527use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1528 1875
1529sub new { 1876sub new {
1530 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1531 1878
1532 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1882 #active_bg => none
1536 #font => default_font 1883 #font => default_font
1537 #text => initial text 1884 #text => initial text
1538 #markup => initial narkup 1885 #markup => initial narkup
1539 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1540 ellipsise => 3, # end 1888 ellipsise => 3, # end
1541 layout => (new CFClient::Layout 2), 1889 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1890 fontsize => 1,
1543 align => -1, 1891 align => -1,
1544 valign => -1, 1892 valign => -1,
1545 padding_x => 2, 1893 padding_x => 2,
1546 padding_y => 2, 1894 padding_y => 2,
1547 can_events => 0, 1895 can_events => 0,
1548 %arg 1896 %arg
1549 ); 1897 );
1550 1898
1551 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout 2; 1900 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1902 $self->{template} = $layout;
1555 } 1903 }
1556 1904
1557 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1559 } else { 1907 } else {
1560 $self->set_text (delete $self->{text}); 1908 $self->set_text (delete $self->{text});
1561 } 1909 }
1562 1910
1563 $self 1911 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1912}
1575 1913
1576sub update { 1914sub update {
1577 my ($self) = @_; 1915 my ($self) = @_;
1578 1916
… …
1627 1965
1628 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1629 1967
1630 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1631 $self->{template}->set_font ($self->{font}) if $self->{font}; 1969 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1);
1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633 1972
1634 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1635 1974
1636 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
… …
1688 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
1689 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692 2031
1693 $self->{size_req} 2032 [$self->{layout}->size]
1694 }; 2033 };
1695 2034
1696 unless (exists $self->{ox}) { 2035 unless (exists $self->{ox}) {
1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
… …
1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1703 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1704 }; 2043 };
1705 2044
1706 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1707 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1708 2053
1709 $self->{layout}->render ($self->{ox}, $self->{oy}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1710} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1711 2064
1712############################################################################# 2065#############################################################################
1713 2066
1714package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1715 2068
1716our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1717 2070
1718use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1719 2072
1720sub new { 2073sub new {
1721 my $class = shift; 2074 my $class = shift;
1722 2075
1723 $class->SUPER::new ( 2076 $class->SUPER::new (
1724 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1725 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1726 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1727 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1728 can_hover => 1, 2083 can_hover => 1,
1729 can_focus => 1, 2084 can_focus => 1,
1730 valign => 0, 2085 valign => 0,
1731 can_events => 1, 2086 can_events => 1,
2087 ellipsise => 0,
1732 #text => ... 2088 #text => ...
1733 #hidden => "*", 2089 #hidden => "*",
1734 @_ 2090 @_
1735 ) 2091 )
1736} 2092}
… …
1781 my $sym = $ev->{sym}; 2137 my $sym = $ev->{sym};
1782 my $uni = $ev->{unicode}; 2138 my $uni = $ev->{unicode};
1783 2139
1784 my $text = $self->get_text; 2140 my $text = $self->get_text;
1785 2141
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2143
1786 if ($uni == 8) { 2144 if ($uni == 8) {
1787 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788 } elsif ($uni == 127) { 2146 } elsif ($uni == 127) {
1789 substr $text, $self->{cursor}, 1, ""; 2147 substr $text, $self->{cursor}, 1, "";
1790 } elsif ($sym == CFClient::SDLK_LEFT) { 2148 } elsif ($sym == CFPlus::SDLK_LEFT) {
1791 --$self->{cursor} if $self->{cursor}; 2149 --$self->{cursor} if $self->{cursor};
1792 } elsif ($sym == CFClient::SDLK_RIGHT) { 2150 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1793 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1794 } elsif ($sym == CFClient::SDLK_HOME) { 2152 } elsif ($sym == CFPlus::SDLK_HOME) {
2153 # what a hack
2154 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1
2157 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) {
2159 # uh, again
2160 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1
2163 : length $self->{text};
2164 } elsif ($uni == 21) { # ctrl-u
2165 $text = "";
1795 $self->{cursor} = 0; 2166 $self->{cursor} = 0;
1796 } elsif ($sym == CFClient::SDLK_END) {
1797 $self->{cursor} = length $text;
1798 } elsif ($uni == 27) { 2167 } elsif ($uni == 27) {
1799 $self->emit ('escape'); 2168 $self->emit ('escape');
1800 } elsif ($uni) { 2169 } elsif ($uni == 0x0d) {
2170 substr $text, $self->{cursor}++, 0, "\012";
2171 } elsif ($uni >= 0x20) {
1801 substr $text, $self->{cursor}++, 0, chr $uni; 2172 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else { 2173 } else {
1803 return 0; 2174 return 0;
1804 } 2175 }
1805 2176
1806 $self->_set_text ($text); 2177 $self->_set_text ($text);
1807 2178
1808 $self->realloc; 2179 $self->realloc;
2180 $self->update;
1809 2181
1810 1 2182 1
1811} 2183}
1812 2184
1813sub invoke_focus_in { 2185sub invoke_focus_in {
… …
1825 2197
1826 my $idx = $self->{layout}->xy_to_index ($x, $y); 2198 my $idx = $self->{layout}->xy_to_index ($x, $y);
1827 2199
1828 # byte-index to char-index 2200 # byte-index to char-index
1829 my $text = $self->{text}; 2201 my $text = $self->{text};
1830 utf8::encode $text; 2202 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831 $self->{cursor} = length substr $text, 0, $idx; 2203 $self->{cursor} = length $text;
1832 2204
1833 $self->_set_text ($self->{text}); 2205 $self->_set_text ($self->{text});
1834 $self->update; 2206 $self->update;
1835 2207
1836 1 2208 1
… …
1872 2244
1873 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
1874 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
1875 utf8::encode $text; 2247 utf8::encode $text;
1876 2248
1877 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1878 } 2250 }
1879 2251
1880 glColor @{$self->{fg}}; 2252 glColor_premultiply @{$self->{active_fg}};
1881 glBegin GL_LINES; 2253 glBegin GL_LINES;
1882 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884 glEnd; 2256 glEnd;
1885 }
1886}
1887 2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2277 }
2278}
2279
2280#############################################################################
2281
1888package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1889 2283
1890our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1891 2285
1892use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1893 2287
1894sub invoke_key_down { 2288sub invoke_key_down {
1895 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1896 2290
1897 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1898 2292
1899 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1900 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1901 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1902 2296
1903 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1904 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1905 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1906 $self->update; 2300 $self->update;
1907 2301
1908 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1909 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1910 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1911 } 2305 }
1912 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1913 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1915 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1916 } 2310 }
1917 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1918 } 2312 }
1919 2313
1920 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1921 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1922 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923 2317
1924 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1925 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1934 1 2328 1
1935} 2329}
1936 2330
1937############################################################################# 2331#############################################################################
1938 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1939package CFClient::UI::Button; 2372package CFPlus::UI::ButtonBin;
1940 2373
1941our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
1942 2375
1943use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1944 2377
1945my @tex = 2378my @tex =
1946 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
1948 2381
1949sub new { 2382sub new {
1950 my $class = shift; 2383 my $class = shift;
1951 2384
1952 $class->SUPER::new ( 2385 $class->SUPER::new (
1953 padding_x => 4,
1954 padding_y => 4,
1955 fg => [1, 1, 1],
1956 active_fg => [0, 0, 1],
1957 can_hover => 1, 2386 can_hover => 1,
1958 align => 0, 2387 align => 0,
1959 valign => 0, 2388 valign => 0,
1960 can_events => 1, 2389 can_events => 1,
1961 @_ 2390 @_
… …
1973} 2402}
1974 2403
1975sub _draw { 2404sub _draw {
1976 my ($self) = @_; 2405 my ($self) = @_;
1977 2406
1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1979
1980 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1982 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
1983 2410
2411 my $tex = $tex[$GRAB == $self];
1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1985 2413
1986 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1987 2415
1988 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
1989} 2417}
1990 2418
1991############################################################################# 2419#############################################################################
1992 2420
2421package CFPlus::UI::Button;
2422
2423our @ISA = CFPlus::UI::Label::;
2424
2425use CFPlus::OpenGL;
2426
2427my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png);
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
2435 padding_x => 4,
2436 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1,
2440 align => 0,
2441 valign => 0,
2442 can_events => 1,
2443 @_
2444 )
2445}
2446
2447sub invoke_button_up {
2448 my ($self, $ev, $x, $y) = @_;
2449
2450 $self->emit ("activate")
2451 if $x >= 0 && $x < $self->{w}
2452 && $y >= 0 && $y < $self->{h};
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2461
2462 glEnable GL_TEXTURE_2D;
2463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2464 glColor 0, 0, 0, 1;
2465
2466 my $tex = $tex[$GRAB == $self];
2467 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2468
2469 glDisable GL_TEXTURE_2D;
2470
2471 $self->SUPER::_draw;
2472}
2473
2474#############################################################################
2475
2476package CFPlus::UI::CheckBox;
2477
2478our @ISA = CFPlus::UI::DrawBG::;
2479
2480my @tex =
2481 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2483
2484use CFPlus::OpenGL;
2485
2486sub new {
2487 my $class = shift;
2488
2489 $class->SUPER::new (
2490 padding_x => 2,
2491 padding_y => 2,
2492 fg => [1, 1, 1],
2493 active_fg => [1, 1, 0],
2494 bg => [0, 0, 0, 0.2],
2495 active_bg => [1, 1, 1, 0.5],
2496 state => 0,
2497 can_hover => 1,
2498 @_
2499 )
2500}
2501
2502sub size_request {
2503 my ($self) = @_;
2504
2505 (6) x 2
2506}
2507
2508sub toggle {
2509 my ($self) = @_;
2510
2511 $self->{state} = !$self->{state};
2512 $self->emit (changed => $self->{state});
2513 $self->update;
2514}
2515
2516sub invoke_button_down {
2517 my ($self, $ev, $x, $y) = @_;
2518
2519 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2520 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2521 $self->toggle;
2522 } else {
2523 return 0
2524 }
2525
2526 1
2527}
2528
2529sub _draw {
2530 my ($self) = @_;
2531
2532 $self->SUPER::_draw;
2533
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2535
2536 my ($w, $h) = @$self{qw(w h)};
2537
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539
2540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2541
2542 my $tex = $self->{state} ? $tex[1] : $tex[0];
2543
2544 glEnable GL_TEXTURE_2D;
2545 $tex->draw_quad_alpha (0, 0, $s, $s);
2546 glDisable GL_TEXTURE_2D;
2547}
2548
2549#############################################################################
2550
2551package CFPlus::UI::Image;
2552
2553our @ISA = CFPlus::UI::Base::;
2554
2555use CFPlus::OpenGL;
2556
2557our %texture_cache;
2558
2559sub new {
2560 my $class = shift;
2561
2562 my $self = $class->SUPER::new (
2563 can_events => 0,
2564 scale => 1,
2565 @_,
2566 );
2567
2568 $self->{path} || $self->{tex}
2569 or Carp::croak "'path' or 'tex' attributes required";
2570
2571 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2573
2574 CFPlus::weaken $texture_cache{$self->{path}};
2575
2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2577
2578 $self
2579}
2580
2581sub STORABLE_freeze {
2582 my ($self, $cloning) = @_;
2583
2584 $self->{path}
2585 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2586
2587 $self->{path}
2588}
2589
2590sub STORABLE_attach {
2591 my ($self, $cloning, $path) = @_;
2592
2593 $self->new (path => $path)
2594}
2595
2596sub size_request {
2597 my ($self) = @_;
2598
2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2600}
2601
2602sub _draw {
2603 my ($self) = @_;
2604
2605 my $tex = $self->{tex};
2606
2607 my ($w, $h) = ($self->{w}, $self->{h});
2608
2609 if ($self->{rot90}) {
2610 glRotate 90, 0, 0, 1;
2611 glTranslate 0, -$self->{w}, 0;
2612
2613 ($w, $h) = ($h, $w);
2614 }
2615
2616 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618
2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2620
2621 glDisable GL_TEXTURE_2D;
2622}
2623
2624#############################################################################
2625
1993package CFClient::UI::ImageButton; 2626package CFPlus::UI::ImageButton;
1994 2627
1995our @ISA = CFClient::UI::Image::; 2628our @ISA = CFPlus::UI::Image::;
1996 2629
1997use CFClient::OpenGL; 2630use CFPlus::OpenGL;
1998 2631
1999my %textures; 2632my %textures;
2000 2633
2001sub new { 2634sub new {
2002 my $class = shift; 2635 my $class = shift;
… …
2024 1 2657 1
2025} 2658}
2026 2659
2027############################################################################# 2660#############################################################################
2028 2661
2029package CFClient::UI::CheckBox;
2030
2031our @ISA = CFClient::UI::DrawBG::;
2032
2033my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037use CFClient::OpenGL;
2038
2039sub new {
2040 my $class = shift;
2041
2042 $class->SUPER::new (
2043 padding_x => 2,
2044 padding_y => 2,
2045 fg => [1, 1, 1],
2046 active_fg => [1, 1, 0],
2047 bg => [0, 0, 0, 0.2],
2048 active_bg => [1, 1, 1, 0.5],
2049 state => 0,
2050 can_hover => 1,
2051 @_
2052 )
2053}
2054
2055sub size_request {
2056 my ($self) = @_;
2057
2058 (6) x 2
2059}
2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2069sub invoke_button_down {
2070 my ($self, $ev, $x, $y) = @_;
2071
2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074 $self->toggle;
2075 } else {
2076 return 0
2077 }
2078
2079 1
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084
2085 $self->SUPER::_draw;
2086
2087 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089 my ($w, $h) = @$self{qw(w h)};
2090
2091 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095 my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097 glEnable GL_TEXTURE_2D;
2098 $tex->draw_quad_alpha (0, 0, $s, $s);
2099 glDisable GL_TEXTURE_2D;
2100}
2101
2102#############################################################################
2103
2104package CFClient::UI::Image; 2662package CFPlus::UI::VGauge;
2105 2663
2106our @ISA = CFClient::UI::Base::; 2664our @ISA = CFPlus::UI::Base::;
2107
2108use CFClient::OpenGL;
2109
2110our %texture_cache;
2111
2112sub new {
2113 my $class = shift;
2114
2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2119
2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2122
2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130 $self
2131}
2132
2133sub size_request {
2134 my ($self) = @_;
2135
2136 ($self->{tex}{w}, $self->{tex}{h})
2137}
2138
2139sub _draw {
2140 my ($self) = @_;
2141
2142 my $tex = $self->{tex};
2143
2144 my ($w, $h) = ($self->{w}, $self->{h});
2145
2146 if ($self->{rot90}) {
2147 glRotate 90, 0, 0, 1;
2148 glTranslate 0, -$self->{w}, 0;
2149
2150 ($w, $h) = ($h, $w);
2151 }
2152
2153 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156 $tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158 glDisable GL_TEXTURE_2D;
2159}
2160
2161#############################################################################
2162
2163package CFClient::UI::VGauge;
2164
2165our @ISA = CFClient::UI::Base::;
2166 2665
2167use List::Util qw(min max); 2666use List::Util qw(min max);
2168 2667
2169use CFClient::OpenGL; 2668use CFPlus::OpenGL;
2170 2669
2171my %tex = ( 2670my %tex = (
2172 food => [ 2671 food => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2672 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175 ], 2674 ],
2176 grace => [ 2675 grace => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2677 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179 ], 2678 ],
2180 hp => [ 2679 hp => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183 ], 2682 ],
2184 mana => [ 2683 mana => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2685 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187 ], 2686 ],
2188); 2687);
2189 2688
2190# eg. VGauge->new (gauge => 'food'), default gauge: food 2689# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2293 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2294} 2793}
2295 2794
2296############################################################################# 2795#############################################################################
2297 2796
2298package CFClient::UI::Gauge; 2797package CFPlus::UI::Gauge;
2299 2798
2300our @ISA = CFClient::UI::VBox::; 2799our @ISA = CFPlus::UI::VBox::;
2301 2800
2302sub new { 2801sub new {
2303 my ($class, %arg) = @_; 2802 my ($class, %arg) = @_;
2304 2803
2305 my $self = $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
… …
2307 can_hover => 1, 2806 can_hover => 1,
2308 can_events => 1, 2807 can_events => 1,
2309 %arg, 2808 %arg,
2310 ); 2809 );
2311 2810
2312 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2811 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2812 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2813 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315 2814
2316 $self 2815 $self
2317} 2816}
2318 2817
2319sub set_fontsize { 2818sub set_fontsize {
… …
2340 $self->{value}->set_text ($val); 2839 $self->{value}->set_text ($val);
2341} 2840}
2342 2841
2343############################################################################# 2842#############################################################################
2344 2843
2345package CFClient::UI::Slider; 2844package CFPlus::UI::Slider;
2346 2845
2347use strict; 2846use strict;
2348 2847
2349use CFClient::OpenGL; 2848use CFPlus::OpenGL;
2350 2849
2351our @ISA = CFClient::UI::DrawBG::; 2850our @ISA = CFPlus::UI::DrawBG::;
2352 2851
2353my @tex = 2852my @tex =
2354 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2853 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355 qw(s1_slider.png s1_slider_bg.png); 2854 qw(s1_slider.png s1_slider_bg.png);
2356 2855
2357sub new { 2856sub new {
2358 my $class = shift; 2857 my $class = shift;
2359 2858
… …
2427 2926
2428 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2429 2928
2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2431 2930
2432 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2433} 2934}
2434 2935
2435sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2436 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2437 2938
… …
2444 2945
2445 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2946 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446 } else { 2947 } else {
2447 return 0; 2948 return 0;
2448 } 2949 }
2950
2951 1
2952}
2953
2954sub invoke_mouse_wheel {
2955 my ($self, $ev) = @_;
2956
2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2958
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2960
2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2449 2962
2450 1 2963 1
2451} 2964}
2452 2965
2453sub update { 2966sub update {
… …
2504 glDisable GL_TEXTURE_2D; 3017 glDisable GL_TEXTURE_2D;
2505} 3018}
2506 3019
2507############################################################################# 3020#############################################################################
2508 3021
2509package CFClient::UI::ValSlider; 3022package CFPlus::UI::ValSlider;
2510 3023
2511our @ISA = CFClient::UI::HBox::; 3024our @ISA = CFPlus::UI::HBox::;
2512 3025
2513sub new { 3026sub new {
2514 my ($class, %arg) = @_; 3027 my ($class, %arg) = @_;
2515 3028
2516 my $range = delete $arg{range}; 3029 my $range = delete $arg{range};
2517 3030
2518 my $self = $class->SUPER::new ( 3031 my $self = $class->SUPER::new (
2519 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3032 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3033 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521 to_value => sub { shift }, 3034 to_value => sub { shift },
2522 from_value => sub { shift }, 3035 from_value => sub { shift },
2523 %arg, 3036 %arg,
2524 ); 3037 );
2525 3038
… …
2545sub set_range { shift->{slider}->set_range (@_) } 3058sub set_range { shift->{slider}->set_range (@_) }
2546sub set_value { shift->{slider}->set_value (@_) } 3059sub set_value { shift->{slider}->set_value (@_) }
2547 3060
2548############################################################################# 3061#############################################################################
2549 3062
2550package CFClient::UI::TextScroller; 3063package CFPlus::UI::TextScroller;
2551 3064
2552our @ISA = CFClient::UI::HBox::; 3065our @ISA = CFPlus::UI::HBox::;
2553 3066
2554use CFClient::OpenGL; 3067use CFPlus::OpenGL;
2555 3068
2556sub new { 3069sub new {
2557 my $class = shift; 3070 my $class = shift;
2558 3071
2559 my $self = $class->SUPER::new ( 3072 my $self = $class->SUPER::new (
2560 fontsize => 1, 3073 fontsize => 1,
2561 can_events => 0, 3074 can_events => 1,
2562 indent => 0, 3075 indent => 0,
2563 #font => default_font 3076 #font => default_font
2564 @_, 3077 @_,
2565 3078
2566 layout => (new CFClient::Layout 2), 3079 layout => (new CFPlus::Layout),
2567 par => [], 3080 par => [],
3081 max_par => 0,
2568 height => 0, 3082 height => 0,
2569 children => [ 3083 children => [
2570 (new CFClient::UI::Empty expand => 1), 3084 (new CFPlus::UI::Empty expand => 1),
2571 (new CFClient::UI::Slider vertical => 1), 3085 (new CFPlus::UI::Slider vertical => 1),
2572 ], 3086 ],
2573 ); 3087 );
2574 3088
2575 $self->{children}[1]->connect (changed => sub { $self->update }); 3089 $self->{children}[1]->connect (changed => sub { $self->update });
2576 3090
… …
2585} 3099}
2586 3100
2587sub size_request { 3101sub size_request {
2588 my ($self) = @_; 3102 my ($self) = @_;
2589 3103
2590 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
2591 3105
2592 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request 3107 $self->SUPER::size_request
2594} 3108}
2595 3109
… …
2606 3120
2607 $self->reflow; 3121 $self->reflow;
2608 3122
2609 local $self->{children} = [$empty, $slider]; 3123 local $self->{children} = [$empty, $slider];
2610 $self->SUPER::invoke_size_allocate ($w, $h) 3124 $self->SUPER::invoke_size_allocate ($w, $h)
3125}
3126
3127sub invoke_mouse_wheel {
3128 my ($self, $ev) = @_;
3129
3130 return 0 unless $ev->{dy}; # only vertical movements
3131
3132 $self->{children}[1]->emit (mouse_wheel => $ev);
3133
3134 1
2611} 3135}
2612 3136
2613sub get_layout { 3137sub get_layout {
2614 my ($self, $para) = @_; 3138 my ($self, $para) = @_;
2615 3139
… …
2643 3167
2644 # todo: base offset on lines or so, not on pixels 3168 # todo: base offset on lines or so, not on pixels
2645 $self->{children}[1]->set_value ($offset); 3169 $self->{children}[1]->set_value ($offset);
2646} 3170}
2647 3171
3172sub current_paragraph {
3173 my ($self) = @_;
3174
3175 $self->{top_paragraph} - 1
3176}
3177
3178sub scroll_to {
3179 my ($self, $para) = @_;
3180
3181 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3182
3183 $self->{scroll_to} = $para;
3184 $self->update;
3185}
3186
2648sub clear { 3187sub clear {
2649 my ($self) = @_; 3188 my ($self) = @_;
2650 3189
2651 my (undef, undef, @other) = @{ $self->{children} }; 3190 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other; 3191 $self->remove ($_) for @other;
… …
2655 $self->{height} = 0; 3194 $self->{height} = 0;
2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3195 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657} 3196}
2658 3197
2659sub add_paragraph { 3198sub add_paragraph {
2660 my ($self, $color, $para, $indent) = @_; 3199 my $self = shift;
2661 3200
2662 my ($text, @w) = ref $para ? @$para : $para; 3201 for my $para (@_) {
2663
2664 $para = { 3202 $para = {
3203 fg => [1, 1, 1, 1],
3204 indent => 0,
3205 markup => "",
3206 widget => [],
3207 ref $para ? %$para : (markup => $para),
2665 w => 1e10, 3208 w => 1e10,
2666 wrapped => 1, 3209 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2671 }; 3210 };
2672 3211
2673 $self->add (@w) if @w; 3212 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674 push @{$self->{par}}, $para; 3213 push @{$self->{par}}, $para;
3214 }
3215
3216 if (my $max = $self->{max_par}) {
3217 shift @{$self->{par}} while @{$self->{par}} > $max;
3218 }
2675 3219
2676 $self->{need_reflow}++; 3220 $self->{need_reflow}++;
2677 $self->update; 3221 $self->update;
2678} 3222}
2679 3223
2680sub scroll_to_bottom { 3224sub scroll_to_bottom {
2681 my ($self) = @_; 3225 my ($self) = @_;
2682 3226
2683 $self->{scroll_to_bottom} = 1; 3227 $self->{scroll_to} = $#{$self->{par}};
2684 $self->update; 3228 $self->update;
2685} 3229}
2686 3230
3231sub force_uptodate {
3232 my ($self) = @_;
3233
3234 if (delete $self->{need_reflow}) {
3235 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3236
3237 my $height = 0;
3238
3239 for my $para (@{$self->{par}}) {
3240 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3241 my $layout = $self->get_layout ($para);
3242 my ($w, $h) = $layout->size;
3243
3244 $para->{w} = $w + $para->{indent};
3245 $para->{h} = $h;
3246 $para->{wrapped} = $layout->has_wrapped;
3247 }
3248
3249 $para->{y} = $height;
3250 $height += $para->{h};
3251 }
3252
3253 $self->{height} = $height;
3254 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3255
3256 delete $self->{texture};
3257 }
3258
3259 if (my $paridx = delete $self->{scroll_to}) {
3260 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3261 }
3262}
3263
2687sub update { 3264sub update {
2688 my ($self) = @_; 3265 my ($self) = @_;
2689 3266
2690 $self->SUPER::update; 3267 $self->SUPER::update;
2691 3268
2692 return unless $self->{h} > 0; 3269 return unless $self->{h} > 0;
2693 3270
2694 delete $self->{texture}; 3271 delete $self->{texture};
2695 3272
2696 $ROOT->on_post_alloc ($self => sub { 3273 $ROOT->on_post_alloc ($self => sub {
3274 $self->force_uptodate;
3275
2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2698 3277
2699 if (delete $self->{need_reflow}) {
2700 my $height = 0;
2701
2702 for my $para (@{$self->{par}}) {
2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2704 my $layout = $self->get_layout ($para);
2705 my ($w, $h) = $layout->size;
2706
2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2710 }
2711
2712 $height += $para->{h};
2713 }
2714
2715 $self->{height} = $height;
2716
2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2718
2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3278 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727 glClearColor 0, 0, 0, 0; 3279 glClearColor 0, 0, 0, 0;
2728 glClear GL_COLOR_BUFFER_BIT; 3280 glClear GL_COLOR_BUFFER_BIT;
2729 3281
3282 package CFPlus::UI::Base;
3283 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284 (0, 0, $self->{w}, $self->{h});
3285
3286 my $top = int $self->{children}[1]{range}[0];
3287
3288 my $paridx = 0;
3289 my $top_paragraph;
2730 my $top = int $self->{children}[1]{range}[0]; 3290 my $top = int $self->{children}[1]{range}[0];
2731 3291
2732 my $y0 = $top; 3292 my $y0 = $top;
2733 my $y1 = $top + $H; 3293 my $y1 = $top + $H;
2734 3294
2735 my $y = 0;
2736
2737 for my $para (@{$self->{par}}) { 3295 for my $para (@{$self->{par}}) {
2738 my $h = $para->{h}; 3296 my $h = $para->{h};
3297 my $y = $para->{y};
2739 3298
2740 if ($y0 < $y + $h && $y < $y1) { 3299 if ($y0 < $y + $h && $y < $y1) {
2741
2742 my $layout = $self->get_layout ($para); 3300 my $layout = $self->get_layout ($para);
2743 3301
2744 $layout->render ($para->{indent}, $y - $y0); 3302 $layout->render ($para->{indent}, $y - $y0);
2745 3303
2746 if (my @w = @{ $para->{widget} }) { 3304 if (my @w = @{ $para->{widget} }) {
… …
2755 $_->draw; 3313 $_->draw;
2756 } 3314 }
2757 } 3315 }
2758 } 3316 }
2759 3317
2760 $y += $h; 3318 $paridx++;
3319 $top_paragraph ||= $paridx if $y >= $top;
2761 } 3320 }
3321
3322 $self->{top_paragraph} = $top_paragraph;
2762 }; 3323 };
2763 }); 3324 });
2764} 3325}
2765 3326
2766sub reconfigure { 3327sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3345 $self->{children}[1]->draw;
2785} 3346}
2786 3347
2787############################################################################# 3348#############################################################################
2788 3349
2789package CFClient::UI::Animator; 3350package CFPlus::UI::Animator;
2790 3351
2791use CFClient::OpenGL; 3352use CFPlus::OpenGL;
2792 3353
2793our @ISA = CFClient::UI::Bin::; 3354our @ISA = CFPlus::UI::Bin::;
2794 3355
2795sub moveto { 3356sub moveto {
2796 my ($self, $x, $y) = @_; 3357 my ($self, $x, $y) = @_;
2797 3358
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3359 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3387 glPopMatrix;
2827} 3388}
2828 3389
2829############################################################################# 3390#############################################################################
2830 3391
2831package CFClient::UI::Flopper; 3392package CFPlus::UI::Flopper;
2832 3393
2833our @ISA = CFClient::UI::Button::; 3394our @ISA = CFPlus::UI::Button::;
2834 3395
2835sub new { 3396sub new {
2836 my $class = shift; 3397 my $class = shift;
2837 3398
2838 my $self = $class->SUPER::new ( 3399 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3411 $self->{other}->toggle_visibility;
2851} 3412}
2852 3413
2853############################################################################# 3414#############################################################################
2854 3415
2855package CFClient::UI::Tooltip; 3416package CFPlus::UI::Tooltip;
2856 3417
2857our @ISA = CFClient::UI::Bin::; 3418our @ISA = CFPlus::UI::Bin::;
2858 3419
2859use CFClient::OpenGL; 3420use CFPlus::OpenGL;
2860 3421
2861sub new { 3422sub new {
2862 my $class = shift; 3423 my $class = shift;
2863 3424
2864 $class->SUPER::new ( 3425 $class->SUPER::new (
… …
2867 ) 3428 )
2868} 3429}
2869 3430
2870sub set_tooltip_from { 3431sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3432 my ($self, $widget) = @_;
3433
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3436
2873 my $tooltip = $widget->{tooltip}; 3437 my $tooltip = $widget->{tooltip};
2874 3438
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3439 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3440 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3444 }
2881 3445
2882 $tooltip =~ s/^\n+//; 3446 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3447 $tooltip =~ s/\n+$//;
2884 3448
2885 $self->add (new CFClient::UI::Label 3449 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3450 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3452 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3453 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3454 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3455 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3456 );
2893} 3457}
2894 3458
… …
2913 3477
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3478 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3479 my $widget = $self->{owner}
2916 or return; 3480 or return;
2917 3481
3482 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3483 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3484
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3485 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3486 if $x + $self->{w} > $self->{root}{w};
2922 3487
2923 $self->move_abs ($x, $y); 3488 $self->move_abs ($x, $y);
3489 } else {
3490 $self->hide;
3491 }
2924 }); 3492 });
2925} 3493}
2926 3494
2927sub _draw { 3495sub _draw {
2928 my ($self) = @_; 3496 my ($self) = @_;
… …
2930 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
2931 3499
2932 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
2933 3501
2934 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
2935 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
2936 glVertex 0 , 0;
2937 glVertex 0 , $h;
2938 glVertex $w, $h;
2939 glVertex $w, 0;
2940 glEnd;
2941 3504
2942 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
2943 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
2944 glVertex 0 , 0; 3507 glVertex 0 , 0;
2945 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
2952 $self->SUPER::_draw; 3515 $self->SUPER::_draw;
2953} 3516}
2954 3517
2955############################################################################# 3518#############################################################################
2956 3519
2957package CFClient::UI::Face; 3520package CFPlus::UI::Face;
2958 3521
2959our @ISA = CFClient::UI::Base::; 3522our @ISA = CFPlus::UI::DrawBG::;
2960 3523
2961use CFClient::OpenGL; 3524use CFPlus::OpenGL;
2962 3525
2963sub new { 3526sub new {
2964 my $class = shift; 3527 my $class = shift;
2965 3528
2966 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
2967 aspect => 1, 3532 aspect => 1,
2968 can_events => 0, 3533 can_events => 0,
2969 @_, 3534 @_,
2970 ); 3535 );
2971 3536
2972 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
2974 3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2975 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3543 parked => 1,
2978 interval => $self->{animspeed},
2979 cb => sub { 3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
2980 ++$widget->{frame}; 3547 ++$widget->{frame};
3548 $widget->update_face;
2981 $widget->update; 3549 $widget->update;
3550
3551 $widget->update_timer;
2982 }, 3552 },
2983 ); 3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
2984 } 3557 }
2985 3558
2986 $self 3559 $self
2987} 3560}
2988 3561
3562sub update_timer {
3563 my ($self) = @_;
3564
3565 return unless $self->{timer};
3566
3567 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start;
3574 } else {
3575 $self->{timer}->stop;
3576 }
3577}
3578
3579sub update_face {
3580 my ($self) = @_;
3581
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
3591}
3592
2989sub size_request { 3593sub size_request {
2990 (32, 8) 3594 my ($self) = @_;
3595
3596 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc;
3604 });
3605 }
3606 }
3607 }
3608
3609 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3610}
2992 3611
2993sub update { 3612sub update {
2994 my ($self) = @_; 3613 my ($self) = @_;
2995 3614
2996 return unless $self->{visible}; 3615 return unless $self->{visible};
2997 3616
2998 $self->SUPER::update; 3617 $self->SUPER::update;
2999} 3618}
3000 3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
3626}
3627
3001sub _draw { 3628sub _draw {
3002 my ($self) = @_; 3629 my ($self) = @_;
3003 3630
3004 return unless $::CONN; 3631 $self->SUPER::_draw;
3005 3632
3006 my $face; 3633 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
… …
3024} 3640}
3025 3641
3026sub destroy { 3642sub destroy {
3027 my ($self) = @_; 3643 my ($self) = @_;
3028 3644
3029 $self->{timer}->cancel 3645 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3646 if $self->{timer};
3031 3647
3032 $self->SUPER::destroy; 3648 $self->SUPER::destroy;
3033} 3649}
3034 3650
3035############################################################################# 3651#############################################################################
3036 3652
3037package CFClient::UI::Buttonbar; 3653package CFPlus::UI::Buttonbar;
3038 3654
3039our @ISA = CFClient::UI::HBox::; 3655our @ISA = CFPlus::UI::HBox::;
3040 3656
3041# TODO: should actualyl wrap buttons and other goodies. 3657# TODO: should actually wrap buttons and other goodies.
3042 3658
3043############################################################################# 3659#############################################################################
3044 3660
3045package CFClient::UI::Menu; 3661package CFPlus::UI::Menu;
3046 3662
3047our @ISA = CFClient::UI::FancyFrame::; 3663our @ISA = CFPlus::UI::Toplevel::;
3048 3664
3049use CFClient::OpenGL; 3665use CFPlus::OpenGL;
3050 3666
3051sub new { 3667sub new {
3052 my $class = shift; 3668 my $class = shift;
3053 3669
3054 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3055 items => [], 3671 items => [],
3056 z => 100, 3672 z => 100,
3057 @_, 3673 @_,
3058 ); 3674 );
3059 3675
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3676 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3677
3062 for my $item (@{ $self->{items} }) { 3678 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3679 my ($widget, $cb, $tooltip) = @$item;
3064 3680
3065 # handle various types of items, only text for now 3681 # handle various types of items, only text for now
3066 if (!ref $widget) { 3682 if (!ref $widget) {
3067 if ($widget =~ /\t/) { 3683 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2; 3684 my ($left, $right) = split /\t/, $widget, 2;
3069 3685
3070 $widget = new CFClient::UI::HBox 3686 $widget = new CFPlus::UI::HBox
3071 can_hover => 1, 3687 can_hover => 1,
3072 can_events => 1, 3688 can_events => 1,
3073 tooltip => $tooltip, 3689 tooltip => $tooltip,
3074 children => [ 3690 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3077 ], 3693 ],
3078 ; 3694 ;
3079 3695
3080 } else { 3696 } else {
3081 $widget = new CFClient::UI::Label 3697 $widget = new CFPlus::UI::Label
3082 can_hover => 1, 3698 can_hover => 1,
3083 can_events => 1, 3699 can_events => 1,
3084 markup => $widget, 3700 markup => $widget,
3085 tooltip => $tooltip; 3701 tooltip => $tooltip;
3086 } 3702 }
… …
3134 1 3750 1
3135} 3751}
3136 3752
3137############################################################################# 3753#############################################################################
3138 3754
3139package CFClient::UI::Multiplexer; 3755package CFPlus::UI::Multiplexer;
3140 3756
3141our @ISA = CFClient::UI::Container::; 3757our @ISA = CFPlus::UI::Container::;
3142 3758
3143sub new { 3759sub new {
3144 my $class = shift; 3760 my $class = shift;
3145 3761
3146 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3207 $self->{current}->draw; 3823 $self->{current}->draw;
3208} 3824}
3209 3825
3210############################################################################# 3826#############################################################################
3211 3827
3212package CFClient::UI::Notebook; 3828package CFPlus::UI::Notebook;
3213 3829
3214our @ISA = CFClient::UI::VBox::; 3830our @ISA = CFPlus::UI::VBox::;
3215 3831
3216sub new { 3832sub new {
3217 my $class = shift; 3833 my $class = shift;
3218 3834
3219 my $self = $class->SUPER::new ( 3835 my $self = $class->SUPER::new (
3220 buttonbar => (new CFClient::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3223 @_, 3839 @_,
3224 ); 3840 );
3225 3841
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228 3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3229 $self 3879 $self
3230} 3880}
3231 3881
3232sub add { 3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3233 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3234 3901
3235 Scalar::Util::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3236 3904
3237 $self->{buttonbar}->add (new CFClient::UI::Button
3238 markup => $title,
3239 tooltip => $tooltip,
3240 on_activate => sub { $self->set_current_page ($widget) },
3241 );
3242
3243 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3244} 3906}
3245 3907
3246sub get_current_page { 3908sub get_current_page {
3247 my ($self) = @_; 3909 my ($self) = @_;
3248 3910
… …
3256 $self->emit (page_changed => $self->{multiplexer}{current}); 3918 $self->emit (page_changed => $self->{multiplexer}{current});
3257} 3919}
3258 3920
3259############################################################################# 3921#############################################################################
3260 3922
3261package CFClient::UI::Combobox; 3923package CFPlus::UI::Selector;
3262 3924
3263use utf8; 3925use utf8;
3264 3926
3265our @ISA = CFClient::UI::Button::; 3927our @ISA = CFPlus::UI::Button::;
3266 3928
3267sub new { 3929sub new {
3268 my $class = shift; 3930 my $class = shift;
3269 3931
3270 my $self = $class->SUPER::new ( 3932 my $self = $class->SUPER::new (
… …
3287 my ($value, $title, $tooltip) = @$_; 3949 my ($value, $title, $tooltip) = @$_;
3288 3950
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3951 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 } 3952 }
3291 3953
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3954 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293} 3955}
3294 3956
3295sub _set_value { 3957sub _set_value {
3296 my ($self, $value) = @_; 3958 my ($self, $value) = @_;
3297 3959
… …
3312 $self->emit (changed => $value); 3974 $self->emit (changed => $value);
3313} 3975}
3314 3976
3315############################################################################# 3977#############################################################################
3316 3978
3317package CFClient::UI::Statusbox; 3979package CFPlus::UI::Statusbox;
3318 3980
3319our @ISA = CFClient::UI::VBox::; 3981our @ISA = CFPlus::UI::VBox::;
3320 3982
3321sub new { 3983sub new {
3322 my $class = shift; 3984 my $class = shift;
3323 3985
3324 my $self = $class->SUPER::new ( 3986 my $self = $class->SUPER::new (
3325 fontsize => 0.8, 3987 fontsize => 0.8,
3326 @_, 3988 @_,
3327 ); 3989 );
3328 3990
3329 Scalar::Util::weaken (my $this = $self); 3991 CFPlus::weaken (my $this = $self);
3330 3992
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332 3994
3333 $self 3995 $self
3334} 3996}
… …
3336sub reorder { 3998sub reorder {
3337 my ($self) = @_; 3999 my ($self) = @_;
3338 my $NOW = Time::HiRes::time; 4000 my $NOW = Time::HiRes::time;
3339 4001
3340 # freeze display when hovering over any label 4002 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner} 4003 return if $CFPlus::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4004 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} }; 4005 values %{ $self->{item} };
3344 4006
3345 while (my ($k, $v) = each %{ $self->{item} }) { 4007 while (my ($k, $v) = each %{ $self->{item} }) {
3346 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4008 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3347 } 4009 }
… …
3368 for ($short) { 4030 for ($short) {
3369 s/^\s+//; 4031 s/^\s+//;
3370 s/\s+/ /g; 4032 s/\s+/ /g;
3371 } 4033 }
3372 4034
3373 new CFClient::UI::Label 4035 new CFPlus::UI::Label
3374 markup => $short, 4036 markup => $short,
3375 tooltip => $item->{tooltip}, 4037 tooltip => $item->{tooltip},
3376 tooltip_font => $::FONT_PROP, 4038 tooltip_font => $::FONT_PROP,
3377 tooltip_width => 0.67, 4039 tooltip_width => 0.67,
3378 fontsize => $item->{fontsize} || $self->{fontsize}, 4040 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3457 $self->SUPER::destroy; 4119 $self->SUPER::destroy;
3458} 4120}
3459 4121
3460############################################################################# 4122#############################################################################
3461 4123
3462package CFClient::UI::Inventory;
3463
3464our @ISA = CFClient::UI::Table::;
3465
3466sub new {
3467 my $class = shift;
3468
3469 my $self = $class->SUPER::new (
3470 col_expand => [0, 1, 0],
3471 @_,
3472 );
3473
3474 $self
3475}
3476
3477sub set_items {
3478 my ($self, $items) = @_;
3479
3480 $self->clear;
3481 return unless $items;
3482
3483 my @items = sort {
3484 ($a->{type} <=> $b->{type})
3485 or ($a->{name} cmp $b->{name})
3486 } values %$items;
3487
3488 $self->{real_items} = \@items;
3489
3490 my $row = 0;
3491 for my $item (@items) {
3492 CFClient::Item::update_widgets $item;
3493
3494 $self->add (0, $row, $item->{face_widget});
3495 $self->add (1, $row, $item->{desc_widget});
3496 $self->add (2, $row, $item->{weight_widget});
3497
3498 $row++;
3499 }
3500}
3501
3502#############################################################################
3503
3504package CFClient::UI::SpellList;
3505
3506our @ISA = CFClient::UI::Table::;
3507
3508sub new {
3509 my $class = shift;
3510
3511 my $self = $class->SUPER::new (
3512 binding => [],
3513 commands => [],
3514 @_,
3515 )
3516}
3517
3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3603sub add_spell {
3604 my ($self, $spell) = @_;
3605
3606 $self->{spell}->{$spell->{name}} = $spell;
3607 $self->rebuild_spell_list;
3608}
3609
3610sub remove_spell {
3611 my ($self, $spell) = @_;
3612
3613 delete $self->{spell}->{$spell->{name}};
3614 $self->rebuild_spell_list;
3615}
3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3624#############################################################################
3625
3626package CFClient::UI::Root; 4124package CFPlus::UI::Root;
3627 4125
3628our @ISA = CFClient::UI::Container::; 4126our @ISA = CFPlus::UI::Container::;
3629 4127
3630use List::Util qw(min max); 4128use List::Util qw(min max);
3631 4129
3632use CFClient::OpenGL; 4130use CFPlus::OpenGL;
3633 4131
3634sub new { 4132sub new {
3635 my $class = shift; 4133 my $class = shift;
3636 4134
3637 my $self = $class->SUPER::new ( 4135 my $self = $class->SUPER::new (
3638 visible => 1, 4136 visible => 1,
3639 @_, 4137 @_,
3640 ); 4138 );
3641 4139
3642 Scalar::Util::weaken ($self->{root} = $self); 4140 CFPlus::weaken ($self->{root} = $self);
3643 4141
3644 $self 4142 $self
3645} 4143}
3646 4144
3647sub size_request { 4145sub size_request {
… …
3742 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
3743 $_->() 4241 $_->()
3744 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
3745 } 4243 }
3746 4244
3747 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
3748 my %queue; 4246 my %queue;
3749 my @queue; 4247 my @queue;
3750 my $widget; 4248 my $widget;
3751 4249
3752 outer: 4250 outer:
… …
3799 } 4297 }
3800 } 4298 }
3801 4299
3802 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
3803 } 4301 }
3804 }
3805 4302
3806 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
3807 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
3808 values %$size_alloc; 4305 values %$size_alloc;
3809 4306
3810 while () { 4307 while () {
3811 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
3812 4309
3813 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3814 4311
3815 $w = 0 if $w < 0; 4312 $w = max $widget->{min_w}, $w;
3816 $h = 0 if $h < 0; 4313 $h = max $widget->{min_h}, $h;
3817 4314
4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4317
4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4320
3818 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
3819 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
3820 4323
3821 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
3823 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
3824 4327
3825 $widget->{w} = $w; 4328 $widget->{w} = $w;
3826 $widget->{h} = $h; 4329 $widget->{h} = $h;
3827 4330
3828 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
3829 } 4333 }
3830 } 4334 }
3831 } 4335 }
3832 4336
3833 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {
3834 $_->() 4338 $_->()
3835 for values %{delete $self->{post_alloc_hook}}; 4339 for values %{delete $self->{post_alloc_hook}};
3836 } 4340 }
3837
3838 4341
3839 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3840 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3841 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
3842 4345
… …
3845 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4348 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3846 glMatrixMode GL_MODELVIEW; 4349 glMatrixMode GL_MODELVIEW;
3847 glLoadIdentity; 4350 glLoadIdentity;
3848 4351
3849 { 4352 {
3850 package CFClient::UI::Base; 4353 package CFPlus::UI::Base;
3851 4354
3852 ($draw_x, $draw_y, $draw_w, $draw_h) = 4355 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3853 (0, 0, $self->{w}, $self->{h}); 4356 (0, 0, $self->{w}, $self->{h});
3854 }
3855 4357
3856 $self->_draw; 4358 $self->_draw;
4359 }
3857} 4360}
3858 4361
3859############################################################################# 4362#############################################################################
3860 4363
3861package CFClient::UI; 4364package CFPlus::UI;
3862 4365
3863$ROOT = new CFClient::UI::Root; 4366$ROOT = new CFPlus::UI::Root;
3864$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4367$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3865 4368
38661 43691
3867 4370

Diff Legend

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