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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 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 { __widget_ref__ => $_[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), 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; 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}) {
… …
1561 } 1909 }
1562 1910
1563 $self 1911 $self
1564} 1912}
1565 1913
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1914sub update {
1577 my ($self) = @_; 1915 my ($self) = @_;
1578 1916
1579 delete $self->{texture}; 1917 delete $self->{texture};
1580 $self->SUPER::update; 1918 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1929 my ($self, $text) = @_;
1592 1930
1593 return if $self->{text} eq "T$text"; 1931 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1932 $self->{text} = "T$text";
1595 1933
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1934 $self->{layout}->set_text ($text);
1598 1935
1599 delete $self->{size_req}; 1936 delete $self->{size_req};
1600 $self->realloc; 1937 $self->realloc;
1601 $self->update; 1938 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1944 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1945 $self->{text} = "M$markup";
1609 1946
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1947 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1948
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1949 $self->{layout}->set_markup ($markup);
1614 1950
1615 delete $self->{size_req}; 1951 delete $self->{size_req};
1616 $self->realloc; 1952 $self->realloc;
1617 $self->update; 1953 $self->update;
… …
1629 1965
1630 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1631 1967
1632 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1633 $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);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1972
1636 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1637 1974
1638 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
… …
1672 2009
1673sub reconfigure { 2010sub reconfigure {
1674 my ($self) = @_; 2011 my ($self) = @_;
1675 2012
1676 delete $self->{size_req}; 2013 delete $self->{size_req};
2014 delete $self->{texture};
1677 2015
1678 $self->SUPER::reconfigure; 2016 $self->SUPER::reconfigure;
1679} 2017}
1680 2018
1681sub _draw { 2019sub _draw {
1682 my ($self) = @_; 2020 my ($self) = @_;
1683 2021
1684 $self->SUPER::_draw; # draw background, if applicable 2022 $self->SUPER::_draw; # draw background, if applicable
1685 2023
1686 my $tex = $self->{texture} ||= do { 2024 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 2025 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 2031
1694 new_from_layout CFClient::Texture $self->{layout} 2032 [$self->{layout}->size]
1695 }; 2033 };
1696 2034
1697 unless (exists $self->{ox}) { 2035 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 2038 : ($self->{w} - $size->[0]) * 0.5);
1701 2039
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 2043 };
1706 2044
1707 glEnable GL_TEXTURE_2D; 2045# unless ($self->{list}) {
1708 2046# $self->{list} = CFPlus::OpenGL::glGenList;
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2047# CFPlus::OpenGL::glNewList $self->{list};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711 2049# CFPlus::OpenGL::glEndList;
1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 } 2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1720 2053
1721 glDisable GL_TEXTURE_2D; 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1722} 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#}
1723 2064
1724############################################################################# 2065#############################################################################
1725 2066
1726package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1727 2068
1728our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1729 2070
1730use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1731 2072
1732sub new { 2073sub new {
1733 my $class = shift; 2074 my $class = shift;
1734 2075
1735 $class->SUPER::new ( 2076 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 2080 active_fg => [0, 0, 0],
1740 can_hover => 1, 2081 can_hover => 1,
1741 can_focus => 1, 2082 can_focus => 1,
1742 valign => 0, 2083 valign => 0,
1743 can_events => 1, 2084 can_events => 1,
2085 ellipsise => 0,
1744 #text => ... 2086 #text => ...
1745 #hidden => "*", 2087 #hidden => "*",
1746 @_ 2088 @_
1747 ) 2089 )
1748} 2090}
… …
1793 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1794 my $uni = $ev->{unicode}; 2136 my $uni = $ev->{unicode};
1795 2137
1796 my $text = $self->get_text; 2138 my $text = $self->get_text;
1797 2139
2140 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2141
1798 if ($uni == 8) { 2142 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 2144 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 2145 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 2146 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 2147 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 2148 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2149 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 2150 } elsif ($sym == CFPlus::SDLK_HOME) {
2151 # what a hack
2152 $self->{cursor} =
2153 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2154 ? length $1
2155 : 0;
2156 } elsif ($sym == CFPlus::SDLK_END) {
2157 # uh, again
2158 $self->{cursor} =
2159 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2160 ? $self->{cursor} + length $1
2161 : length $self->{text};
2162 } elsif ($uni == 21) { # ctrl-u
2163 $text = "";
1807 $self->{cursor} = 0; 2164 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 2165 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 2166 $self->emit ('escape');
1812 } elsif ($uni) { 2167 } elsif ($uni == 0x0d) {
2168 substr $text, $self->{cursor}++, 0, "\012";
2169 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2170 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2171 } else {
1815 return 0; 2172 return 0;
1816 } 2173 }
1817 2174
1818 $self->_set_text ($text); 2175 $self->_set_text ($text);
1819 2176
1820 $self->realloc; 2177 $self->realloc;
2178 $self->update;
1821 2179
1822 1 2180 1
1823} 2181}
1824 2182
1825sub invoke_focus_in { 2183sub invoke_focus_in {
… …
1837 2195
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2196 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2197
1840 # byte-index to char-index 2198 # byte-index to char-index
1841 my $text = $self->{text}; 2199 my $text = $self->{text};
1842 utf8::encode $text; 2200 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2201 $self->{cursor} = length $text;
1844 2202
1845 $self->_set_text ($self->{text}); 2203 $self->_set_text ($self->{text});
1846 $self->update; 2204 $self->update;
1847 2205
1848 1 2206 1
… …
1887 utf8::encode $text; 2245 utf8::encode $text;
1888 2246
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2248 }
1891 2249
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2250 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2251 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2252 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2253 glEnd;
1897 } 2254 }
1898} 2255}
1899 2256
2257#############################################################################
2258
1900package CFClient::UI::Entry; 2259package CFPlus::UI::Entry;
1901 2260
1902our @ISA = CFClient::UI::EntryBase::; 2261our @ISA = CFPlus::UI::EntryBase::;
1903 2262
1904use CFClient::OpenGL; 2263use CFPlus::OpenGL;
1905 2264
1906sub invoke_key_down { 2265sub invoke_key_down {
1907 my ($self, $ev) = @_; 2266 my ($self, $ev) = @_;
1908 2267
1909 my $sym = $ev->{sym}; 2268 my $sym = $ev->{sym};
1910 2269
1911 if ($sym == 13) { 2270 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2271 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2272 my $txt = $self->get_text;
1914 2273
1915 $self->{history_pointer} = -1; 2274 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2275 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2276 $self->emit (activate => $txt);
1918 $self->update; 2277 $self->update;
1919 2278
1920 } elsif ($sym == CFClient::SDLK_UP) { 2279 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2280 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2281 $self->{history_saveback} = $self->get_text;
1923 } 2282 }
1924 if (@{$self->{history} || []} > 0) { 2283 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2284 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2286 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2287 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2288 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2289 }
1931 2290
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2291 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2292 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2293 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2294
1936 if ($self->{history_pointer} >= 0) { 2295 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2305 1
1947} 2306}
1948 2307
1949############################################################################# 2308#############################################################################
1950 2309
2310package CFPlus::UI::TextEdit;
2311
2312our @ISA = CFPlus::UI::EntryBase::;
2313
2314use CFPlus::OpenGL;
2315
2316sub move_cursor_ver {
2317 my ($self, $dy) = @_;
2318
2319 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2320
2321 $y += $dy;
2322
2323 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2324 $self->{cursor} = $index;
2325 delete $self->{cur_h};
2326 $self->update;
2327 return;
2328 }
2329}
2330
2331sub invoke_key_down {
2332 my ($self, $ev) = @_;
2333
2334 my $sym = $ev->{sym};
2335
2336 if ($sym == CFPlus::SDLK_UP) {
2337 $self->move_cursor_ver (-1);
2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
2339 $self->move_cursor_ver (+1);
2340 } else {
2341 return $self->SUPER::invoke_key_down ($ev)
2342 }
2343
2344 1
2345}
2346
2347#############################################################################
2348
1951package CFClient::UI::Button; 2349package CFPlus::UI::Button;
1952 2350
1953our @ISA = CFClient::UI::Label::; 2351our @ISA = CFPlus::UI::Label::;
1954 2352
1955use CFClient::OpenGL; 2353use CFPlus::OpenGL;
1956 2354
1957my @tex = 2355my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2357 qw(b1_button_inactive.png b1_button_active.png);
1960 2358
1961sub new { 2359sub new {
1962 my $class = shift; 2360 my $class = shift;
1963 2361
1964 $class->SUPER::new ( 2362 $class->SUPER::new (
1965 padding_x => 4, 2363 padding_x => 4,
1966 padding_y => 4, 2364 padding_y => 4,
1967 fg => [1, 1, 1], 2365 fg => [1.0, 1.0, 1.0],
1968 active_fg => [0, 0, 1], 2366 active_fg => [0.8, 0.8, 0.8],
1969 can_hover => 1, 2367 can_hover => 1,
1970 align => 0, 2368 align => 0,
1971 valign => 0, 2369 valign => 0,
1972 can_events => 1, 2370 can_events => 1,
1973 @_ 2371 @_
… …
1991 2389
1992 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1995 2393
2394 my $tex = $tex[$GRAB == $self];
1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997 2396
1998 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1999 2398
2000 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
2001} 2400}
2002 2401
2003############################################################################# 2402#############################################################################
2004 2403
2404package CFPlus::UI::CheckBox;
2405
2406our @ISA = CFPlus::UI::DrawBG::;
2407
2408my @tex =
2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2410 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2411
2412use CFPlus::OpenGL;
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 2,
2419 padding_y => 2,
2420 fg => [1, 1, 1],
2421 active_fg => [1, 1, 0],
2422 bg => [0, 0, 0, 0.2],
2423 active_bg => [1, 1, 1, 0.5],
2424 state => 0,
2425 can_hover => 1,
2426 @_
2427 )
2428}
2429
2430sub size_request {
2431 my ($self) = @_;
2432
2433 (6) x 2
2434}
2435
2436sub toggle {
2437 my ($self) = @_;
2438
2439 $self->{state} = !$self->{state};
2440 $self->emit (changed => $self->{state});
2441 $self->update;
2442}
2443
2444sub invoke_button_down {
2445 my ($self, $ev, $x, $y) = @_;
2446
2447 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2448 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2449 $self->toggle;
2450 } else {
2451 return 0
2452 }
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 $self->SUPER::_draw;
2461
2462 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2463
2464 my ($w, $h) = @$self{qw(w h)};
2465
2466 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2467
2468 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2469
2470 my $tex = $self->{state} ? $tex[1] : $tex[0];
2471
2472 glEnable GL_TEXTURE_2D;
2473 $tex->draw_quad_alpha (0, 0, $s, $s);
2474 glDisable GL_TEXTURE_2D;
2475}
2476
2477#############################################################################
2478
2479package CFPlus::UI::Image;
2480
2481our @ISA = CFPlus::UI::Base::;
2482
2483use CFPlus::OpenGL;
2484
2485our %texture_cache;
2486
2487sub new {
2488 my $class = shift;
2489
2490 my $self = $class->SUPER::new (
2491 can_events => 0,
2492 @_,
2493 );
2494
2495 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required";
2497
2498 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2499 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2500
2501 CFPlus::weaken $texture_cache{$self->{path}};
2502
2503 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2504
2505 $self
2506}
2507
2508sub STORABLE_freeze {
2509 my ($self, $cloning) = @_;
2510
2511 $self->{path}
2512 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2513
2514 $self->{path}
2515}
2516
2517sub STORABLE_attach {
2518 my ($self, $cloning, $path) = @_;
2519
2520 $self->new (path => $path)
2521}
2522
2523sub size_request {
2524 my ($self) = @_;
2525
2526 ($self->{tex}{w}, $self->{tex}{h})
2527}
2528
2529sub _draw {
2530 my ($self) = @_;
2531
2532 my $tex = $self->{tex};
2533
2534 my ($w, $h) = ($self->{w}, $self->{h});
2535
2536 if ($self->{rot90}) {
2537 glRotate 90, 0, 0, 1;
2538 glTranslate 0, -$self->{w}, 0;
2539
2540 ($w, $h) = ($h, $w);
2541 }
2542
2543 glEnable GL_TEXTURE_2D;
2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2545
2546 $tex->draw_quad (0, 0, $w, $h);
2547
2548 glDisable GL_TEXTURE_2D;
2549}
2550
2551#############################################################################
2552
2005package CFClient::UI::ImageButton; 2553package CFPlus::UI::ImageButton;
2006 2554
2007our @ISA = CFClient::UI::Image::; 2555our @ISA = CFPlus::UI::Image::;
2008 2556
2009use CFClient::OpenGL; 2557use CFPlus::OpenGL;
2010 2558
2011my %textures; 2559my %textures;
2012 2560
2013sub new { 2561sub new {
2014 my $class = shift; 2562 my $class = shift;
… …
2036 1 2584 1
2037} 2585}
2038 2586
2039############################################################################# 2587#############################################################################
2040 2588
2041package CFClient::UI::CheckBox;
2042
2043our @ISA = CFClient::UI::DrawBG::;
2044
2045my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049use CFClient::OpenGL;
2050
2051sub new {
2052 my $class = shift;
2053
2054 $class->SUPER::new (
2055 padding_x => 2,
2056 padding_y => 2,
2057 fg => [1, 1, 1],
2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
2061 state => 0,
2062 can_hover => 1,
2063 @_
2064 )
2065}
2066
2067sub size_request {
2068 my ($self) = @_;
2069
2070 (6) x 2
2071}
2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
2081sub invoke_button_down {
2082 my ($self, $ev, $x, $y) = @_;
2083
2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086 $self->toggle;
2087 } else {
2088 return 0
2089 }
2090
2091 1
2092}
2093
2094sub _draw {
2095 my ($self) = @_;
2096
2097 $self->SUPER::_draw;
2098
2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109 glEnable GL_TEXTURE_2D;
2110 $tex->draw_quad_alpha (0, 0, $s, $s);
2111 glDisable GL_TEXTURE_2D;
2112}
2113
2114#############################################################################
2115
2116package CFClient::UI::Image; 2589package CFPlus::UI::VGauge;
2117 2590
2118our @ISA = CFClient::UI::Base::; 2591our @ISA = CFPlus::UI::Base::;
2119
2120use CFClient::OpenGL;
2121
2122our %texture_cache;
2123
2124sub new {
2125 my $class = shift;
2126
2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2131
2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2134
2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142 $self
2143}
2144
2145sub size_request {
2146 my ($self) = @_;
2147
2148 ($self->{tex}{w}, $self->{tex}{h})
2149}
2150
2151sub _draw {
2152 my ($self) = @_;
2153
2154 my $tex = $self->{tex};
2155
2156 my ($w, $h) = ($self->{w}, $self->{h});
2157
2158 if ($self->{rot90}) {
2159 glRotate 90, 0, 0, 1;
2160 glTranslate 0, -$self->{w}, 0;
2161
2162 ($w, $h) = ($h, $w);
2163 }
2164
2165 glEnable GL_TEXTURE_2D;
2166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168 $tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170 glDisable GL_TEXTURE_2D;
2171}
2172
2173#############################################################################
2174
2175package CFClient::UI::VGauge;
2176
2177our @ISA = CFClient::UI::Base::;
2178 2592
2179use List::Util qw(min max); 2593use List::Util qw(min max);
2180 2594
2181use CFClient::OpenGL; 2595use CFPlus::OpenGL;
2182 2596
2183my %tex = ( 2597my %tex = (
2184 food => [ 2598 food => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2600 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187 ], 2601 ],
2188 grace => [ 2602 grace => [
2189 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2603 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2604 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191 ], 2605 ],
2192 hp => [ 2606 hp => [
2193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2608 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195 ], 2609 ],
2196 mana => [ 2610 mana => [
2197 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2612 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199 ], 2613 ],
2200); 2614);
2201 2615
2202# eg. VGauge->new (gauge => 'food'), default gauge: food 2616# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2305 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2306} 2720}
2307 2721
2308############################################################################# 2722#############################################################################
2309 2723
2310package CFClient::UI::Gauge; 2724package CFPlus::UI::Gauge;
2311 2725
2312our @ISA = CFClient::UI::VBox::; 2726our @ISA = CFPlus::UI::VBox::;
2313 2727
2314sub new { 2728sub new {
2315 my ($class, %arg) = @_; 2729 my ($class, %arg) = @_;
2316 2730
2317 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
… …
2319 can_hover => 1, 2733 can_hover => 1,
2320 can_events => 1, 2734 can_events => 1,
2321 %arg, 2735 %arg,
2322 ); 2736 );
2323 2737
2324 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2738 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2739 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2740 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327 2741
2328 $self 2742 $self
2329} 2743}
2330 2744
2331sub set_fontsize { 2745sub set_fontsize {
… …
2352 $self->{value}->set_text ($val); 2766 $self->{value}->set_text ($val);
2353} 2767}
2354 2768
2355############################################################################# 2769#############################################################################
2356 2770
2357package CFClient::UI::Slider; 2771package CFPlus::UI::Slider;
2358 2772
2359use strict; 2773use strict;
2360 2774
2361use CFClient::OpenGL; 2775use CFPlus::OpenGL;
2362 2776
2363our @ISA = CFClient::UI::DrawBG::; 2777our @ISA = CFPlus::UI::DrawBG::;
2364 2778
2365my @tex = 2779my @tex =
2366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2780 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367 qw(s1_slider.png s1_slider_bg.png); 2781 qw(s1_slider.png s1_slider_bg.png);
2368 2782
2369sub new { 2783sub new {
2370 my $class = shift; 2784 my $class = shift;
2371 2785
… …
2439 2853
2440 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2441 2855
2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2443 2857
2444 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2445} 2861}
2446 2862
2447sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2448 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2449 2865
… …
2456 2872
2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2873 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else { 2874 } else {
2459 return 0; 2875 return 0;
2460 } 2876 }
2877
2878 1
2879}
2880
2881sub invoke_mouse_wheel {
2882 my ($self, $ev) = @_;
2883
2884 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2885
2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2887
2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2461 2889
2462 1 2890 1
2463} 2891}
2464 2892
2465sub update { 2893sub update {
… …
2516 glDisable GL_TEXTURE_2D; 2944 glDisable GL_TEXTURE_2D;
2517} 2945}
2518 2946
2519############################################################################# 2947#############################################################################
2520 2948
2521package CFClient::UI::ValSlider; 2949package CFPlus::UI::ValSlider;
2522 2950
2523our @ISA = CFClient::UI::HBox::; 2951our @ISA = CFPlus::UI::HBox::;
2524 2952
2525sub new { 2953sub new {
2526 my ($class, %arg) = @_; 2954 my ($class, %arg) = @_;
2527 2955
2528 my $range = delete $arg{range}; 2956 my $range = delete $arg{range};
2529 2957
2530 my $self = $class->SUPER::new ( 2958 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2959 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2960 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift }, 2961 to_value => sub { shift },
2534 from_value => sub { shift }, 2962 from_value => sub { shift },
2535 %arg, 2963 %arg,
2536 ); 2964 );
2537 2965
… …
2557sub set_range { shift->{slider}->set_range (@_) } 2985sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) } 2986sub set_value { shift->{slider}->set_value (@_) }
2559 2987
2560############################################################################# 2988#############################################################################
2561 2989
2562package CFClient::UI::TextScroller; 2990package CFPlus::UI::TextScroller;
2563 2991
2564our @ISA = CFClient::UI::HBox::; 2992our @ISA = CFPlus::UI::HBox::;
2565 2993
2566use CFClient::OpenGL; 2994use CFPlus::OpenGL;
2567 2995
2568sub new { 2996sub new {
2569 my $class = shift; 2997 my $class = shift;
2570 2998
2571 my $self = $class->SUPER::new ( 2999 my $self = $class->SUPER::new (
2572 fontsize => 1, 3000 fontsize => 1,
2573 can_events => 0, 3001 can_events => 1,
2574 indent => 0, 3002 indent => 0,
2575 #font => default_font 3003 #font => default_font
2576 @_, 3004 @_,
2577 3005
2578 layout => (new CFClient::Layout 1), 3006 layout => (new CFPlus::Layout),
2579 par => [], 3007 par => [],
3008 max_par => 0,
2580 height => 0, 3009 height => 0,
2581 children => [ 3010 children => [
2582 (new CFClient::UI::Empty expand => 1), 3011 (new CFPlus::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 3012 (new CFPlus::UI::Slider vertical => 1),
2584 ], 3013 ],
2585 ); 3014 );
2586 3015
2587 $self->{children}[1]->connect (changed => sub { $self->update }); 3016 $self->{children}[1]->connect (changed => sub { $self->update });
2588 3017
… …
2597} 3026}
2598 3027
2599sub size_request { 3028sub size_request {
2600 my ($self) = @_; 3029 my ($self) = @_;
2601 3030
2602 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
2603 3032
2604 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request 3034 $self->SUPER::size_request
2606} 3035}
2607 3036
… …
2618 3047
2619 $self->reflow; 3048 $self->reflow;
2620 3049
2621 local $self->{children} = [$empty, $slider]; 3050 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 3051 $self->SUPER::invoke_size_allocate ($w, $h)
3052}
3053
3054sub invoke_mouse_wheel {
3055 my ($self, $ev) = @_;
3056
3057 return 0 unless $ev->{dy}; # only vertical movements
3058
3059 $self->{children}[1]->emit (mouse_wheel => $ev);
3060
3061 1
2623} 3062}
2624 3063
2625sub get_layout { 3064sub get_layout {
2626 my ($self, $para) = @_; 3065 my ($self, $para) = @_;
2627 3066
… …
2655 3094
2656 # todo: base offset on lines or so, not on pixels 3095 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset); 3096 $self->{children}[1]->set_value ($offset);
2658} 3097}
2659 3098
3099sub current_paragraph {
3100 my ($self) = @_;
3101
3102 $self->{top_paragraph} - 1
3103}
3104
3105sub scroll_to {
3106 my ($self, $para) = @_;
3107
3108 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3109
3110 $self->{scroll_to} = $para;
3111 $self->update;
3112}
3113
2660sub clear { 3114sub clear {
2661 my ($self) = @_; 3115 my ($self) = @_;
2662 3116
2663 my (undef, undef, @other) = @{ $self->{children} }; 3117 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other; 3118 $self->remove ($_) for @other;
… …
2667 $self->{height} = 0; 3121 $self->{height} = 0;
2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3122 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669} 3123}
2670 3124
2671sub add_paragraph { 3125sub add_paragraph {
2672 my ($self, $color, $para, $indent) = @_; 3126 my $self = shift;
2673 3127
2674 my ($text, @w) = ref $para ? @$para : $para; 3128 for my $para (@_) {
2675
2676 $para = { 3129 $para = {
3130 fg => [1, 1, 1, 1],
3131 indent => 0,
3132 markup => "",
3133 widget => [],
3134 ref $para ? %$para : (markup => $para),
2677 w => 1e10, 3135 w => 1e10,
2678 wrapped => 1, 3136 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 }; 3137 };
2684 3138
2685 $self->add (@w) if @w; 3139 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686 push @{$self->{par}}, $para; 3140 push @{$self->{par}}, $para;
3141 }
3142
3143 if (my $max = $self->{max_par}) {
3144 shift @{$self->{par}} while @{$self->{par}} > $max;
3145 }
2687 3146
2688 $self->{need_reflow}++; 3147 $self->{need_reflow}++;
2689 $self->update; 3148 $self->update;
2690} 3149}
2691 3150
2692sub scroll_to_bottom { 3151sub scroll_to_bottom {
2693 my ($self) = @_; 3152 my ($self) = @_;
2694 3153
2695 $self->{scroll_to_bottom} = 1; 3154 $self->{scroll_to} = $#{$self->{par}};
2696 $self->update; 3155 $self->update;
2697} 3156}
2698 3157
3158sub force_uptodate {
3159 my ($self) = @_;
3160
3161 if (delete $self->{need_reflow}) {
3162 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3163
3164 my $height = 0;
3165
3166 for my $para (@{$self->{par}}) {
3167 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3168 my $layout = $self->get_layout ($para);
3169 my ($w, $h) = $layout->size;
3170
3171 $para->{w} = $w + $para->{indent};
3172 $para->{h} = $h;
3173 $para->{wrapped} = $layout->has_wrapped;
3174 }
3175
3176 $para->{y} = $height;
3177 $height += $para->{h};
3178 }
3179
3180 $self->{height} = $height;
3181 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3182
3183 delete $self->{texture};
3184 }
3185
3186 if (my $paridx = delete $self->{scroll_to}) {
3187 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3188 }
3189}
3190
2699sub update { 3191sub update {
2700 my ($self) = @_; 3192 my ($self) = @_;
2701 3193
2702 $self->SUPER::update; 3194 $self->SUPER::update;
2703 3195
2704 return unless $self->{h} > 0; 3196 return unless $self->{h} > 0;
2705 3197
2706 delete $self->{texture}; 3198 delete $self->{texture};
2707 3199
2708 $ROOT->on_post_alloc ($self => sub { 3200 $ROOT->on_post_alloc ($self => sub {
3201 $self->force_uptodate;
3202
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3203 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710 3204
2711 if (delete $self->{need_reflow}) {
2712 my $height = 0;
2713
2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2726
2727 $self->{height} = $height;
2728
2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3205 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739 glClearColor 0, 0, 0, 0; 3206 glClearColor 0, 0, 0, 0;
2740 glClear GL_COLOR_BUFFER_BIT; 3207 glClear GL_COLOR_BUFFER_BIT;
2741 3208
3209 package CFPlus::UI::Base;
3210 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3211 (0, 0, $self->{w}, $self->{h});
3212
3213 my $top = int $self->{children}[1]{range}[0];
3214
3215 my $paridx = 0;
3216 my $top_paragraph;
2742 my $top = int $self->{children}[1]{range}[0]; 3217 my $top = int $self->{children}[1]{range}[0];
2743 3218
2744 my $y0 = $top; 3219 my $y0 = $top;
2745 my $y1 = $top + $H; 3220 my $y1 = $top + $H;
2746 3221
2747 my $y = 0;
2748
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 3222 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 3223 my $h = $para->{h};
3224 my $y = $para->{y};
2755 3225
2756 if ($y0 < $y + $h && $y < $y1) { 3226 if ($y0 < $y + $h && $y < $y1) {
2757
2758 my $layout = $self->get_layout ($para); 3227 my $layout = $self->get_layout ($para);
2759 3228
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 3229 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 3230
2765 if (my @w = @{ $para->{widget} }) { 3231 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 3232 my @s = $layout->get_shapes;
2767 3233
2768 glDisable GL_BLEND;
2769 for (@w) { 3234 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 3235 my ($dx, $dy) = splice @s, 0, 2, ();
2771 3236
2772 $_->{x} = $dx + $para->{indent}; 3237 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 3238 $_->{y} = $dy + $y - $y0;
2774 3239
2775 $_->draw; 3240 $_->draw;
2776 } 3241 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 3242 }
2780 } 3243 }
2781 3244
2782 $y += $h; 3245 $paridx++;
3246 $top_paragraph ||= $paridx if $y >= $top;
2783 } 3247 }
2784 3248
2785 glDisable GL_BLEND; 3249 $self->{top_paragraph} = $top_paragraph;
2786 }; 3250 };
2787 }); 3251 });
2788} 3252}
2789 3253
2790sub reconfigure { 3254sub reconfigure {
… …
2808 $self->{children}[1]->draw; 3272 $self->{children}[1]->draw;
2809} 3273}
2810 3274
2811############################################################################# 3275#############################################################################
2812 3276
2813package CFClient::UI::Animator; 3277package CFPlus::UI::Animator;
2814 3278
2815use CFClient::OpenGL; 3279use CFPlus::OpenGL;
2816 3280
2817our @ISA = CFClient::UI::Bin::; 3281our @ISA = CFPlus::UI::Bin::;
2818 3282
2819sub moveto { 3283sub moveto {
2820 my ($self, $x, $y) = @_; 3284 my ($self, $x, $y) = @_;
2821 3285
2822 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3286 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2850 glPopMatrix; 3314 glPopMatrix;
2851} 3315}
2852 3316
2853############################################################################# 3317#############################################################################
2854 3318
2855package CFClient::UI::Flopper; 3319package CFPlus::UI::Flopper;
2856 3320
2857our @ISA = CFClient::UI::Button::; 3321our @ISA = CFPlus::UI::Button::;
2858 3322
2859sub new { 3323sub new {
2860 my $class = shift; 3324 my $class = shift;
2861 3325
2862 my $self = $class->SUPER::new ( 3326 my $self = $class->SUPER::new (
… …
2874 $self->{other}->toggle_visibility; 3338 $self->{other}->toggle_visibility;
2875} 3339}
2876 3340
2877############################################################################# 3341#############################################################################
2878 3342
2879package CFClient::UI::Tooltip; 3343package CFPlus::UI::Tooltip;
2880 3344
2881our @ISA = CFClient::UI::Bin::; 3345our @ISA = CFPlus::UI::Bin::;
2882 3346
2883use CFClient::OpenGL; 3347use CFPlus::OpenGL;
2884 3348
2885sub new { 3349sub new {
2886 my $class = shift; 3350 my $class = shift;
2887 3351
2888 $class->SUPER::new ( 3352 $class->SUPER::new (
… …
2891 ) 3355 )
2892} 3356}
2893 3357
2894sub set_tooltip_from { 3358sub set_tooltip_from {
2895 my ($self, $widget) = @_; 3359 my ($self, $widget) = @_;
3360
3361 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3362 if $widget->{tooltip} =~ /^#(.*)$/;
2896 3363
2897 my $tooltip = $widget->{tooltip}; 3364 my $tooltip = $widget->{tooltip};
2898 3365
2899 if ($ENV{CFPLUS_DEBUG} & 2) { 3366 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n" 3367 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2904 } 3371 }
2905 3372
2906 $tooltip =~ s/^\n+//; 3373 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//; 3374 $tooltip =~ s/\n+$//;
2908 3375
2909 $self->add (new CFClient::UI::Label 3376 $self->add (new CFPlus::UI::Label
2910 markup => $tooltip, 3377 markup => $tooltip,
2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3378 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912 fontsize => 0.8, 3379 fontsize => 0.8,
2913 fg => [0, 0, 0, 1], 3380 style => 1, # FLAG_INVERSE
2914 ellipsise => 0, 3381 ellipsise => 0,
2915 font => ($widget->{tooltip_font} || $::FONT_PROP), 3382 font => ($widget->{tooltip_font} || $::FONT_PROP),
2916 ); 3383 );
2917} 3384}
2918 3385
… …
2937 3404
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3405 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3406 my $widget = $self->{owner}
2940 or return; 3407 or return;
2941 3408
3409 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3410 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3411
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3412 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3413 if $x + $self->{w} > $self->{root}{w};
2946 3414
2947 $self->move_abs ($x, $y); 3415 $self->move_abs ($x, $y);
3416 } else {
3417 $self->hide;
3418 }
2948 }); 3419 });
2949} 3420}
2950 3421
2951sub _draw { 3422sub _draw {
2952 my ($self) = @_; 3423 my ($self) = @_;
… …
2976 $self->SUPER::_draw; 3447 $self->SUPER::_draw;
2977} 3448}
2978 3449
2979############################################################################# 3450#############################################################################
2980 3451
2981package CFClient::UI::Face; 3452package CFPlus::UI::Face;
2982 3453
2983our @ISA = CFClient::UI::Base::; 3454our @ISA = CFPlus::UI::DrawBG::;
2984 3455
2985use CFClient::OpenGL; 3456use CFPlus::OpenGL;
2986 3457
2987sub new { 3458sub new {
2988 my $class = shift; 3459 my $class = shift;
2989 3460
2990 my $self = $class->SUPER::new ( 3461 my $self = $class->SUPER::new (
3462 size_w => 32,
3463 size_h => 8,
2991 aspect => 1, 3464 aspect => 1,
2992 can_events => 0, 3465 can_events => 0,
2993 @_, 3466 @_,
2994 ); 3467 );
2995 3468
2996 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
2997 Scalar::Util::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
2998 3471
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2999 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
3000 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001 hard => 1, 3475 parked => 1,
3002 interval => $self->{animspeed},
3003 cb => sub { 3476 cb => sub {
3477 return unless $::CONN && $widget;
3478
3004 ++$widget->{frame}; 3479 ++$widget->{frame};
3480 $widget->update_face;
3005 $widget->update; 3481 $widget->update;
3482
3483 $widget->update_timer;
3006 }, 3484 },
3007 ); 3485 );
3486
3487 $self->update_face;
3488 $self->update_timer;
3008 } 3489 }
3009 3490
3010 $self 3491 $self
3011} 3492}
3012 3493
3494sub update_timer {
3495 my ($self) = @_;
3496
3497 return unless $self->{timer};
3498
3499 if ($self->{visible}) {
3500 $self->{timer}->at (
3501 $self->{anim_start}
3502 + $self->{animspeed}
3503 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3504 );
3505 $self->{timer}->start;
3506 } else {
3507 $self->{timer}->stop;
3508 }
3509}
3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 }
3522 }
3523}
3524
3013sub size_request { 3525sub size_request {
3014 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3535 $self->realloc;
3536 });
3537 }
3538 }
3539 }
3540
3541 ($self->{size_w} || 8, $self->{size_h} || 8)
3015} 3542}
3016 3543
3017sub update { 3544sub update {
3018 my ($self) = @_; 3545 my ($self) = @_;
3019 3546
3020 return unless $self->{visible}; 3547 return unless $self->{visible};
3021 3548
3022 $self->SUPER::update; 3549 $self->SUPER::update;
3023} 3550}
3024 3551
3552sub invoke_visibility_change {
3553 my ($self) = @_;
3554
3555 $self->update_timer;
3556
3557 0
3558}
3559
3025sub _draw { 3560sub _draw {
3026 my ($self) = @_; 3561 my ($self) = @_;
3027 3562
3028 return unless $::CONN; 3563 $self->SUPER::_draw;
3029 3564
3030 my $face; 3565 if (my $tex = $self->{tex}) {
3031
3032 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}];
3034
3035 $face = $anim->[ $self->{frame} % @$anim ]
3036 if $anim && @$anim;
3037 }
3038
3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3040
3041 if ($tex) {
3042 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3046 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3048} 3572}
3049 3573
3050sub destroy { 3574sub destroy {
3051 my ($self) = @_; 3575 my ($self) = @_;
3052 3576
3053 $self->{timer}->cancel 3577 (delete $self->{timer})->cancel
3054 if $self->{timer}; 3578 if $self->{timer};
3055 3579
3056 $self->SUPER::destroy; 3580 $self->SUPER::destroy;
3057} 3581}
3058 3582
3059############################################################################# 3583#############################################################################
3060 3584
3061package CFClient::UI::Buttonbar; 3585package CFPlus::UI::Buttonbar;
3062 3586
3063our @ISA = CFClient::UI::HBox::; 3587our @ISA = CFPlus::UI::HBox::;
3064 3588
3065# TODO: should actualyl wrap buttons and other goodies. 3589# TODO: should actually wrap buttons and other goodies.
3066 3590
3067############################################################################# 3591#############################################################################
3068 3592
3069package CFClient::UI::Menu; 3593package CFPlus::UI::Menu;
3070 3594
3071our @ISA = CFClient::UI::FancyFrame::; 3595our @ISA = CFPlus::UI::Toplevel::;
3072 3596
3073use CFClient::OpenGL; 3597use CFPlus::OpenGL;
3074 3598
3075sub new { 3599sub new {
3076 my $class = shift; 3600 my $class = shift;
3077 3601
3078 my $self = $class->SUPER::new ( 3602 my $self = $class->SUPER::new (
3079 items => [], 3603 items => [],
3080 z => 100, 3604 z => 100,
3081 @_, 3605 @_,
3082 ); 3606 );
3083 3607
3084 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3608 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085 3609
3086 for my $item (@{ $self->{items} }) { 3610 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3611 my ($widget, $cb, $tooltip) = @$item;
3088 3612
3089 # handle various types of items, only text for now 3613 # handle various types of items, only text for now
3090 if (!ref $widget) { 3614 if (!ref $widget) {
3615 if ($widget =~ /\t/) {
3616 my ($left, $right) = split /\t/, $widget, 2;
3617
3091 $widget = new CFClient::UI::Label 3618 $widget = new CFPlus::UI::HBox
3092 can_hover => 1, 3619 can_hover => 1,
3093 can_events => 1, 3620 can_events => 1,
3621 tooltip => $tooltip,
3622 children => [
3623 (new CFPlus::UI::Label markup => $left, expand => 1),
3624 (new CFPlus::UI::Label markup => $right, align => +1),
3625 ],
3626 ;
3627
3628 } else {
3629 $widget = new CFPlus::UI::Label
3630 can_hover => 1,
3631 can_events => 1,
3094 markup => $widget, 3632 markup => $widget,
3095 tooltip => $tooltip 3633 tooltip => $tooltip;
3634 }
3096 } 3635 }
3097 3636
3098 $self->{item}{$widget} = $item; 3637 $self->{item}{$widget} = $item;
3099 3638
3100 $self->{vbox}->add ($widget); 3639 $self->{vbox}->add ($widget);
… …
3143 1 3682 1
3144} 3683}
3145 3684
3146############################################################################# 3685#############################################################################
3147 3686
3148package CFClient::UI::Multiplexer; 3687package CFPlus::UI::Multiplexer;
3149 3688
3150our @ISA = CFClient::UI::Container::; 3689our @ISA = CFPlus::UI::Container::;
3151 3690
3152sub new { 3691sub new {
3153 my $class = shift; 3692 my $class = shift;
3154 3693
3155 my $self = $class->SUPER::new ( 3694 my $self = $class->SUPER::new (
… …
3216 $self->{current}->draw; 3755 $self->{current}->draw;
3217} 3756}
3218 3757
3219############################################################################# 3758#############################################################################
3220 3759
3221package CFClient::UI::Notebook; 3760package CFPlus::UI::Notebook;
3222 3761
3223our @ISA = CFClient::UI::VBox::; 3762our @ISA = CFPlus::UI::VBox::;
3224 3763
3225sub new { 3764sub new {
3226 my $class = shift; 3765 my $class = shift;
3227 3766
3228 my $self = $class->SUPER::new ( 3767 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar), 3768 buttonbar => (new CFPlus::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self 3770 # filter => # will be put between multiplexer and $self
3232 @_, 3771 @_,
3233 ); 3772 );
3234 3773
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3238 $self 3811 $self
3239} 3812}
3240 3813
3241sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3242 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3243 3828
3244 Scalar::Util::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3245 3831
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3253} 3833}
3254 3834
3255sub get_current_page { 3835sub get_current_page {
3256 my ($self) = @_; 3836 my ($self) = @_;
3257 3837
… …
3265 $self->emit (page_changed => $self->{multiplexer}{current}); 3845 $self->emit (page_changed => $self->{multiplexer}{current});
3266} 3846}
3267 3847
3268############################################################################# 3848#############################################################################
3269 3849
3270package CFClient::UI::Combobox; 3850package CFPlus::UI::Selector;
3271 3851
3272use utf8; 3852use utf8;
3273 3853
3274our @ISA = CFClient::UI::Button::; 3854our @ISA = CFPlus::UI::Button::;
3275 3855
3276sub new { 3856sub new {
3277 my $class = shift; 3857 my $class = shift;
3278 3858
3279 my $self = $class->SUPER::new ( 3859 my $self = $class->SUPER::new (
… …
3296 my ($value, $title, $tooltip) = @$_; 3876 my ($value, $title, $tooltip) = @$_;
3297 3877
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3878 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 } 3879 }
3300 3880
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3881 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302} 3882}
3303 3883
3304sub _set_value { 3884sub _set_value {
3305 my ($self, $value) = @_; 3885 my ($self, $value) = @_;
3306 3886
… …
3321 $self->emit (changed => $value); 3901 $self->emit (changed => $value);
3322} 3902}
3323 3903
3324############################################################################# 3904#############################################################################
3325 3905
3326package CFClient::UI::Statusbox; 3906package CFPlus::UI::Statusbox;
3327 3907
3328our @ISA = CFClient::UI::VBox::; 3908our @ISA = CFPlus::UI::VBox::;
3329 3909
3330sub new { 3910sub new {
3331 my $class = shift; 3911 my $class = shift;
3332 3912
3333 my $self = $class->SUPER::new ( 3913 my $self = $class->SUPER::new (
3334 fontsize => 0.8, 3914 fontsize => 0.8,
3335 @_, 3915 @_,
3336 ); 3916 );
3337 3917
3338 Scalar::Util::weaken (my $this = $self); 3918 CFPlus::weaken (my $this = $self);
3339 3919
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3920 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341 3921
3342 $self 3922 $self
3343} 3923}
… …
3345sub reorder { 3925sub reorder {
3346 my ($self) = @_; 3926 my ($self) = @_;
3347 my $NOW = Time::HiRes::time; 3927 my $NOW = Time::HiRes::time;
3348 3928
3349 # freeze display when hovering over any label 3929 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner} 3930 return if $CFPlus::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3931 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} }; 3932 values %{ $self->{item} };
3353 3933
3354 while (my ($k, $v) = each %{ $self->{item} }) { 3934 while (my ($k, $v) = each %{ $self->{item} }) {
3355 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3935 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356 } 3936 }
… …
3377 for ($short) { 3957 for ($short) {
3378 s/^\s+//; 3958 s/^\s+//;
3379 s/\s+/ /g; 3959 s/\s+/ /g;
3380 } 3960 }
3381 3961
3382 new CFClient::UI::Label 3962 new CFPlus::UI::Label
3383 markup => $short, 3963 markup => $short,
3384 tooltip => $item->{tooltip}, 3964 tooltip => $item->{tooltip},
3385 tooltip_font => $::FONT_PROP, 3965 tooltip_font => $::FONT_PROP,
3386 tooltip_width => 0.67, 3966 tooltip_width => 0.67,
3387 fontsize => $item->{fontsize} || $self->{fontsize}, 3967 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3466 $self->SUPER::destroy; 4046 $self->SUPER::destroy;
3467} 4047}
3468 4048
3469############################################################################# 4049#############################################################################
3470 4050
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root; 4051package CFPlus::UI::Root;
3636 4052
3637our @ISA = CFClient::UI::Container::; 4053our @ISA = CFPlus::UI::Container::;
3638 4054
3639use List::Util qw(min max); 4055use List::Util qw(min max);
3640 4056
3641use CFClient::OpenGL; 4057use CFPlus::OpenGL;
3642 4058
3643sub new { 4059sub new {
3644 my $class = shift; 4060 my $class = shift;
3645 4061
3646 my $self = $class->SUPER::new ( 4062 my $self = $class->SUPER::new (
3647 visible => 1, 4063 visible => 1,
3648 @_, 4064 @_,
3649 ); 4065 );
3650 4066
3651 Scalar::Util::weaken ($self->{root} = $self); 4067 CFPlus::weaken ($self->{root} = $self);
3652 4068
3653 $self 4069 $self
3654} 4070}
3655 4071
3656sub size_request { 4072sub size_request {
… …
3751 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
3752 $_->() 4168 $_->()
3753 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
3754 } 4170 }
3755 4171
3756 if ($self->{realloc}) { 4172 while ($self->{realloc}) {
3757 my %queue; 4173 my %queue;
3758 my @queue; 4174 my @queue;
3759 my $widget; 4175 my $widget;
3760 4176
3761 outer: 4177 outer:
… …
3808 } 4224 }
3809 } 4225 }
3810 4226
3811 delete $self->{realloc}{$widget+0}; 4227 delete $self->{realloc}{$widget+0};
3812 } 4228 }
3813 }
3814 4229
3815 while (my $size_alloc = delete $self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
3816 my @queue = sort { $b->{visible} <=> $a->{visible} } 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
3817 values %$size_alloc; 4232 values %$size_alloc;
3818 4233
3819 while () { 4234 while () {
3820 my $widget = pop @queue || last; 4235 my $widget = pop @queue || last;
3821 4236
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 4238
3824 $w = 0 if $w < 0; 4239 $w = max $widget->{min_w}, $w;
3825 $h = 0 if $h < 0; 4240 $h = max $widget->{min_h}, $h;
3826 4241
4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4244
4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4247
3827 $w = int $w + 0.5; 4248 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4249 $h = int $h + 0.5;
3829 4250
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 4252 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h}; 4253 $widget->{old_h} = $widget->{h};
3833 4254
3834 $widget->{w} = $w; 4255 $widget->{w} = $w;
3835 $widget->{h} = $h; 4256 $widget->{h} = $h;
3836 4257
3837 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
3838 } 4260 }
3839 } 4261 }
3840 } 4262 }
3841 4263
3842 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {
3843 $_->() 4265 $_->()
3844 for values %{delete $self->{post_alloc_hook}}; 4266 for values %{delete $self->{post_alloc_hook}};
3845 } 4267 }
3846
3847 4268
3848 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4269 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4270 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850 glClear GL_COLOR_BUFFER_BIT; 4271 glClear GL_COLOR_BUFFER_BIT;
3851 4272
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4275 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4276 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4277 glLoadIdentity;
3857 4278
3858 { 4279 {
3859 package CFClient::UI::Base; 4280 package CFPlus::UI::Base;
3860 4281
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4282 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4283 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4284
3865 $self->_draw; 4285 $self->_draw;
4286 }
3866} 4287}
3867 4288
3868############################################################################# 4289#############################################################################
3869 4290
3870package CFClient::UI; 4291package CFPlus::UI;
3871 4292
3872$ROOT = new CFClient::UI::Root; 4293$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4294$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4295
38751 42961
3876 4297

Diff Legend

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