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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

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

Diff Legend

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