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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 warn "button down $ev->{button}\n";#d# 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
89 105
90 if (!$BUTTON_STATE) { 106 unless ($GRAB) {
91 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
92 108
93 $GRAB = $widget; 109 $GRAB = $widget;
94 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
95 111
96 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
97 } 113 }
98 114
99 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
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;
100 120
101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
102 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 }
103} 129}
104 130
105sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
106 my ($ev) = @_; 132 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y});
108 133
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110 135
111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112 137
113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
114 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115 140
116 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
117 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
118 $grab->update if $grab; 143 $grab->update if $grab;
119 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
120 145
146 check_hover $widget;
121 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
122 } 148 }
123} 149}
124 150
125sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
126 my ($ev) = @_; 152 my ($ev) = @_;
127 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
128 154
129 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130 156
131 if ($widget != $HOVER) { 157 check_hover $widget;
132 my $hover = $HOVER; $HOVER = $widget;
133 158
134 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
135 $HOVER->update if $HOVER && $HOVER->{can_hover};
136
137 $TOOLTIP_WATCHER->start;
138 }
139
140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141 if $HOVER; 160 if $HOVER;
142} 161}
143 162
144# convert position array to integers 163# convert position array to integers
145sub harmonize { 164sub harmonize {
… …
195 reconfigure_widgets; 214 reconfigure_widgets;
196} 215}
197 216
198############################################################################# 217#############################################################################
199 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
200package CFClient::UI::Base; 227package CFPlus::UI::Base;
201 228
202use strict; 229use strict;
203 230
204use CFClient::OpenGL; 231use CFPlus::OpenGL;
205 232
206sub new { 233sub new {
207 my $class = shift; 234 my $class = shift;
208 235
209 my $self = bless { 236 my $self = bless {
… …
214 h => undef, 241 h => undef,
215 can_events => 1, 242 can_events => 1,
216 @_ 243 @_
217 }, $class; 244 }, $class;
218 245
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220 247
221 for (keys %$self) { 248 for (keys %$self) {
222 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
223 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
224 } 251 }
225 } 252 }
226 253
227 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228 $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};
229 $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};
230 $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};
231 $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};
232 259
233 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235 262
236 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
241 268
242sub destroy { 269sub destroy {
243 my ($self) = @_; 270 my ($self) = @_;
244 271
245 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
246 %$self = (); 274 %$self = ();
247} 275}
248 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
249sub show { 281sub show {
250 my ($self) = @_; 282 my ($self) = @_;
251 283
252 return if $self->{parent}; 284 return if $self->{parent};
253 285
254 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
255} 287}
256 288
257sub set_visible { 289sub set_visible {
258 my ($self) = @_; 290 my ($self) = @_;
259 291
… …
280 delete $self->{root}; 312 delete $self->{root};
281 313
282 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
283 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
284 316
285 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
286 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
287 319
288 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
289 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
290} 322}
… …
292sub set_visibility { 324sub set_visibility {
293 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
294 326
295 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
296 328
297 $visible ? $self->hide 329 $visible ? $self->show
298 : $self->show; 330 : $self->hide;
299} 331}
300 332
301sub toggle_visibility { 333sub toggle_visibility {
302 my ($self) = @_; 334 my ($self) = @_;
303 335
… …
347 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
348 380
349 if ($self->{aspect}) { 381 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
351 383
352 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354 386
355 # use alignment to adjust x, y 387 # use alignment to adjust x, y
356 388
357 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
358 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
399 431
400 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
401 433
402 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
403 435
404 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
406 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
407 } 439 }
408} 440}
409 441
410# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
411sub coord2local { 443sub coord2local {
412 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
413 445
446 Carp::confess unless $self->{parent};#d#
447
414 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415} 449}
416 450
417# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
418sub coord2global { 452sub coord2global {
419 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
454
455 Carp::confess unless $self->{parent};#d#
420 456
421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422} 458}
423 459
424sub invoke_focus_in { 460sub invoke_focus_in {
… …
458 494
459sub invoke_mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
460sub invoke_button_up { 0 } 496sub invoke_button_up { 0 }
461sub invoke_key_down { 0 } 497sub invoke_key_down { 0 }
462sub invoke_key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
463 500
464sub invoke_button_down { 501sub invoke_button_down {
465 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
466 503
467 $self->grab_focus; 504 $self->grab_focus;
468 505
469 warn "button down $ev->{button} $x $y\n";#d#
470
471 0 506 0
472} 507}
473 508
474sub connect { 509sub connect {
475 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
476 511
477 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 }
478} 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);
479 532
480sub emit { 533sub emit {
481 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
482 535
483 #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
484 (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
485 || ($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
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
487} 554}
488 555
489sub find_widget { 556#sub find_widget {
490 my ($self, $x, $y) = @_; 557# in .xs
491
492 return () unless $self->{can_events};
493
494 return $self
495 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
496 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
497
498 ()
499}
500 558
501sub set_parent { 559sub set_parent {
502 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
503 561
504 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
505 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
506} 564}
507 565
508sub realloc { 566sub realloc {
509 my ($self) = @_; 567 my ($self) = @_;
… …
535 593
536# 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
537# functions seems pointless. 595# functions seems pointless.
538our ($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
539 597
540sub draw { 598#sub draw {
541 my ($self) = @_; 599#CFPlus.xs
542
543 return unless $self->{h} && $self->{w};
544
545 # update screen rectangle
546 local $draw_x = $draw_x + $self->{x};
547 local $draw_y = $draw_y + $self->{y};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552
553 glPushMatrix;
554 glTranslate $self->{x}, $self->{y}, 0;
555
556 if ($self == $HOVER && $self->{can_hover}) {
557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
558 glEnable GL_BLEND;
559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
560 glBegin GL_QUADS;
561 glVertex 0 , 0;
562 glVertex $self->{w}, 0;
563 glVertex $self->{w}, $self->{h};
564 glVertex 0 , $self->{h};
565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
579 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 }
582
583 $self->_draw;
584 glPopMatrix;
585}
586 600
587sub _draw { 601sub _draw {
588 my ($self) = @_; 602 my ($self) = @_;
589 603
590 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
591} 605}
592 606
593sub DESTROY { 607sub DESTROY {
594 my ($self) = @_; 608 my ($self) = @_;
595 609
596 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
597
598 delete $WIDGET{$self+0};
599 611
600 eval { $self->destroy }; 612 eval { $self->destroy };
601 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};
602} 616}
603 617
604############################################################################# 618#############################################################################
605 619
606package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
607 621
608our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
609 623
610use strict; 624use strict;
611use CFClient::OpenGL; 625use CFPlus::OpenGL;
612 626
613sub new { 627sub new {
614 my $class = shift; 628 my $class = shift;
615 629
616 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
647 } 661 }
648} 662}
649 663
650############################################################################# 664#############################################################################
651 665
652package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
653 667
654our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
655 669
656sub new { 670sub new {
657 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
658 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
659} 673}
… …
666 680
667sub draw { } 681sub draw { }
668 682
669############################################################################# 683#############################################################################
670 684
671package CFClient::UI::Container; 685package CFPlus::UI::Container;
672 686
673our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
674 688
675sub new { 689sub new {
676 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
677 691
678 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
682 can_events => 0, 696 can_events => 0,
683 %arg, 697 %arg,
684 ); 698 );
685 699
686 $self->add (@$children) 700 $self->add (@$children)
687 if $children; 701 if $children && @$children;
688 702
689 $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;
690} 712}
691 713
692sub add { 714sub add {
693 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
694 716
695 $_->set_parent ($self) 717 $_->set_parent ($self)
696 for @widgets; 718 for @widgets;
697 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
698 use sort 'stable'; 721 use sort 'stable';
699 722
700 $self->{children} = [ 723 $self->{children} = [
701 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
702 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
703 ]; 726 ];
704 727
705 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
706} 733}
707 734
708sub children { 735sub children {
709 @{ $_[0]{children} } 736 @{ $_[0]{children} }
710} 737}
711 738
712sub remove { 739sub remove {
713 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
714 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
715 delete $child->{parent}; 745 delete $child->{parent};
716 $child->hide; 746 $child->hide;
717
718 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
719 749
720 $self->realloc; 750 $self->realloc;
721} 751}
722 752
723sub clear { 753sub clear {
724 my ($self) = @_; 754 my ($self) = @_;
725 755
726 my $children = delete $self->{children}; 756 my $children = $self->{children};
727 $self->{children} = []; 757 $self->{children} = [];
728 758
729 for (@$children) { 759 for (@$children) {
730 delete $_->{parent}; 760 delete $_->{parent};
731 $_->hide; 761 $_->hide;
… …
751} 781}
752 782
753sub _draw { 783sub _draw {
754 my ($self) = @_; 784 my ($self) = @_;
755 785
756 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
757} 787}
758 788
759############################################################################# 789#############################################################################
760 790
761package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
762 792
763our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
764 794
765sub new { 795sub new {
766 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
767 797
768 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769 799
770 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
771} 801}
772 802
773sub add { 803sub add {
774 my ($self, $child) = @_; 804 my ($self, $child) = @_;
775 805
776 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
777 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
778} 808}
779 809
780sub remove { 810sub remove {
781 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
782 812
783 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
784 814
785 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
786 unless @{$self->{children}}; 816 unless @{$self->{children}};
787} 817}
788 818
789sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
790 820
… …
802 832
803############################################################################# 833#############################################################################
804 834
805# back-buffered drawing area 835# back-buffered drawing area
806 836
807package CFClient::UI::Window; 837package CFPlus::UI::Window;
808 838
809our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
810 840
811use CFClient::OpenGL; 841use CFPlus::OpenGL;
812 842
813sub new { 843sub new {
814 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
815 845
816 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
838} 868}
839 869
840sub render_child { 870sub render_child {
841 my ($self) = @_; 871 my ($self) = @_;
842 872
843 $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 {
844 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
845 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
846 876
847 { 877 {
848 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
849 879
850 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
852 } 884 }
853
854 $self->_render;
855 }; 885 };
856} 886}
857 887
858sub _draw { 888sub _draw {
859 my ($self) = @_; 889 my ($self) = @_;
860
861 my ($w, $h) = @$self{qw(w h)};
862 890
863 my $tex = $self->{texture} 891 my $tex = $self->{texture}
864 or return; 892 or return;
865 893
866 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
869 897
870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
871 899
872 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
873} 901}
874 902
875############################################################################# 903#############################################################################
876 904
877package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
878 906
907use List::Util qw(min max);
908
879our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
880 910
881sub new { 911sub new {
882 my $class = shift; 912 my $class = shift;
883 913
884 $class->SUPER::new ( 914 $class->SUPER::new (
… …
891sub size_request { 921sub size_request {
892 my ($self) = @_; 922 my ($self) = @_;
893 923
894 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
895 925
896 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
897 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
898 928
899 ($w, $h) 929 ($w, $h)
900} 930}
901 931
902sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
914} 944}
915 945
916sub set_offset { 946sub set_offset {
917 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
918 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}) {
919 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
920 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
921 955
956 $self->emit (changed => $x, $y);
922 $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 }
923} 977}
924 978
925# 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
926sub coord2local { 980sub coord2local {
927 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
942 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
943 997
944 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
946 ) { 1000 ) {
947 $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})
948 } else { 1002 } else {
949 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
950 } 1004 }
951} 1005}
952 1006
953sub _render { 1007sub _render {
954 my ($self) = @_; 1008 my ($self) = @_;
955 1009
956 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};
957 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};
958 1012
959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960 1014
961 $self->SUPER::_render; 1015 $self->SUPER::_render;
962} 1016}
963 1017
964############################################################################# 1018#############################################################################
965 1019
966package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
967 1021
968our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
969 1023
970sub new { 1024sub new {
971 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
972 1026
973 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
974 1028
975 my $self; 1029 my $self;
976 1030
977 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,
978 vertical => 1, 1045 vertical => 1,
979 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
980 on_changed => sub { 1047 on_changed => sub {
981 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982 }, 1050 },
983 ; 1051 ;
984 1052
985 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
987 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
988 %arg, 1061 %arg,
989 ); 1062 );
990 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
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
992 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
993 1088
994 $self 1089 $self
995} 1090}
996
997#TODO# update range on size_allocate depending on child
998 1091
999sub add { 1092sub add {
1000 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1001 1094
1002 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1003} 1096}
1004 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
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});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
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 {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
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
1005sub invoke_button_down { 1159sub invoke_button_down {
1006 my ($self, $ev) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1007 1161
1008 warn "button down $ev->{button}\n";#d# 1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1009 1165 }
1166
1010 0 1167 0
1011} 1168}
1012 1169
1013sub update_slider { 1170sub invoke_button_up {
1014 my ($self) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1015 1172
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1173 if (delete $self->{motion}) {
1017} 1174 return 1;
1175 }
1018 1176
1019sub update { 1177 0
1020 my ($self) = @_; 1178}
1021 1179
1022 $self->SUPER::update; 1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1023 1182
1024 $self->update_slider; 1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1025} 1189}
1026 1190
1027sub invoke_size_allocate { 1191sub invoke_size_allocate {
1028 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1029 1193
1030 $self->update_slider; 1194 $self->update_slider;
1031
1032 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1033} 1196}
1034 1197
1035############################################################################# 1198#############################################################################
1036 1199
1037package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1038 1201
1039our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1040 1203
1041use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1042 1205
1043sub new { 1206sub new {
1044 my $class = shift; 1207 my $class = shift;
1045 1208
1046 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1072 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1073} 1236}
1074 1237
1075############################################################################# 1238#############################################################################
1076 1239
1077package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1078 1241
1079our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1080 1243
1081use 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;
1082 1345
1083my $bg = 1346my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1086 1349
1087my @border = 1350my @border =
1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 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);
1090 1357
1091sub new { 1358sub new {
1092 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1093 1360
1094 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
1099 min_w => 64, 1366 min_w => 64,
1100 min_h => 32, 1367 min_h => 32,
1101 %arg, 1368 %arg,
1102 ); 1369 );
1103 1370
1104 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1105 align => 0, 1372 align => 0,
1106 valign => 1, 1373 valign => 1,
1107 text => $self->{title}, 1374 text => $self->{title},
1108 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1109 if exists $self->{title}; 1376 if exists $self->{title};
1110 1377
1111 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1112 $self->{close_button} = 1379 $self->{close_button} =
1113 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1114 path => 'x1_close.png', 1381 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") }; 1382 on_activate => sub { $self->emit ("delete") };
1116 1383
1117 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1118 } 1385 }
1119 1386
1120 $self 1387 $self
1121} 1388}
1122 1389
1123sub add { 1390sub add {
1124 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1125 1392
1126 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1127 $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};
1128 $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};
1129} 1396}
1130 1397
1131sub border { 1398sub border {
1132 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1133} 1400}
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1509
1243 ! ! $self->{motion} 1510 ! ! $self->{motion}
1244} 1511}
1245 1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1519}
1520
1246sub _draw { 1521sub _draw {
1247 my ($self) = @_; 1522 my ($self) = @_;
1248 1523
1249 my $child = $self->{children}[0]; 1524 my $child = $self->{children}[0];
1250 1525
… …
1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1256 1531
1257 my $border = $self->border; 1532 my $border = $self->border;
1258 1533
1259 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1260 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1263 $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);
1264 1553
1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1266 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1267 1556
1268 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1287 if $self->{close_button}; 1576 if $self->{close_button};
1288} 1577}
1289 1578
1290############################################################################# 1579#############################################################################
1291 1580
1292package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1293 1582
1294our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1295 1584
1296use List::Util qw(max sum); 1585use List::Util qw(max sum);
1297 1586
1298use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1299 1588
1300sub new { 1589sub new {
1301 my $class = shift; 1590 my $class = shift;
1302 1591
1303 $class->SUPER::new ( 1592 $class->SUPER::new (
1304 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1305 @_, 1595 @_,
1306 ) 1596 )
1307} 1597}
1308 1598
1309sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311}
1312
1313sub add { 1599sub add {
1314 my ($self, $x, $y, $child) = @_; 1600 my ($self, @widgets) = @_;
1315 1601
1316 $child->set_parent ($self); 1602 for my $child (@widgets) {
1317 $self->{children}[$y][$x] = $child; 1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1318 1606
1319 $self->realloc; 1607 $self->SUPER::add (@widgets);
1320} 1608}
1321 1609
1322sub 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 {
1323 my ($self, $child) = @_; 1628 my ($self) = @_;
1324 1629
1325 # TODO: not yet implemented 1630 my (@w, @h);
1326}
1327
1328# TODO: move to container class maybe? send children a signal on removal?
1329sub clear {
1330 my ($self) = @_;
1331 1631
1332 my @children = $self->children; 1632 my @children = $self->children;
1333 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 }
1334 1643 }
1335 for (@children) {
1336 delete $_->{parent};
1337 $_->hide;
1338 }
1339 1644
1340 $self->realloc; 1645 # second pass, rows
1341} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1342
1343sub get_wh {
1344 my ($self) = @_;
1345
1346 my (@w, @h);
1347
1348 for my $y (0 .. $#{$self->{children}}) {
1349 my $row = $self->{children}[$y]
1350 or next;
1351
1352 for my $x (0 .. $#$row) {
1353 my $widget = $row->[$x]
1354 or next;
1355 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1356 1648
1357 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1358 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1359 } 1653 }
1360 } 1654 }
1361 1655
1362 (\@w, \@h) 1656 (\@w, \@h)
1363} 1657}
… …
1379 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1380 1674
1381 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1382 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1383 1677
1384 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1385 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1386 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1387 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1388 1682
1389 # linearly scale sizes
1390 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392 1684
1393 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
1394 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1395 1694
1396 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1397 1697
1398 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1399 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1400 or next;
1401 1700
1402 my $x = 0; 1701 $widget->configure (
1403 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1404 1704 );
1405 for my $c (0 .. $#$row) { 1705 }
1406 my $col_w = $ws->[$c];
1407 1706
1408 if (my $widget = $row->[$c]) { 1707 1
1409 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1410 }
1411 1709
1412 $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};
1413 } 1737 }
1738 }
1414 1739
1415 $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});
1416 } 1771 }
1417 1772
1418 1 1773 1
1419} 1774}
1420 1775
1421sub find_widget {
1422 my ($self, $x, $y) = @_;
1423
1424 $x -= $self->{x};
1425 $y -= $self->{y};
1426
1427 my $res;
1428
1429 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1430 $res = $_->find_widget ($x, $y)
1431 and return $res;
1432 }
1433
1434 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1435}
1436
1437sub _draw {
1438 my ($self) = @_;
1439
1440 for (grep $_, @{$self->{children}}) {
1441 $_->draw for grep $_, @$_;
1442 }
1443}
1444
1445############################################################################# 1776#############################################################################
1446 1777
1447package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1448 1779
1449our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1450 1781
1451sub size_request { 1782sub size_request {
1452 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1453 1786
1454 $self->{vertical} 1787 $self->{vertical}
1455 ? ( 1788 ? (
1456 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1457 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1458 ) 1791 )
1459 : ( 1792 : (
1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1461 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1462 ) 1795 )
1463} 1796}
1464 1797
1465sub invoke_size_allocate { 1798sub invoke_size_allocate {
1466 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1487 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children; 1821 for 0 .. $#children;
1489 } 1822 }
1490 } 1823 }
1491 1824
1492 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1493 1826
1494 my $pos = 0; 1827 my $pos = 0;
1495 for (0 .. $#children) { 1828 for (0 .. $#children) {
1496 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1497 $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));
… …
1502 1 1835 1
1503} 1836}
1504 1837
1505############################################################################# 1838#############################################################################
1506 1839
1507package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1508 1841
1509our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1510 1843
1511sub new { 1844sub new {
1512 my $class = shift; 1845 my $class = shift;
1513 1846
1514 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1517 ) 1850 )
1518} 1851}
1519 1852
1520############################################################################# 1853#############################################################################
1521 1854
1522package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1523 1856
1524our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1525 1858
1526sub new { 1859sub new {
1527 my $class = shift; 1860 my $class = shift;
1528 1861
1529 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1532 ) 1865 )
1533} 1866}
1534 1867
1535############################################################################# 1868#############################################################################
1536 1869
1537package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1538 1871
1539our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1540 1873
1541use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1542 1875
1543sub new { 1876sub new {
1544 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1545 1878
1546 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1549 #active_bg => none 1882 #active_bg => none
1550 #font => default_font 1883 #font => default_font
1551 #text => initial text 1884 #text => initial text
1552 #markup => initial narkup 1885 #markup => initial narkup
1553 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1554 ellipsise => 3, # end 1888 ellipsise => 3, # end
1555 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1556 fontsize => 1, 1890 fontsize => 1,
1557 align => -1, 1891 align => -1,
1558 valign => -1, 1892 valign => -1,
1559 padding_x => 2, 1893 padding_x => 2,
1560 padding_y => 2, 1894 padding_y => 2,
1561 can_events => 0, 1895 can_events => 0,
1562 %arg 1896 %arg
1563 ); 1897 );
1564 1898
1565 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1566 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1567 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1568 $self->{template} = $layout; 1902 $self->{template} = $layout;
1569 } 1903 }
1570 1904
1571 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1573 } else { 1907 } else {
1574 $self->set_text (delete $self->{text}); 1908 $self->set_text (delete $self->{text});
1575 } 1909 }
1576 1910
1577 $self 1911 $self
1578}
1579
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588} 1912}
1589 1913
1590sub update { 1914sub update {
1591 my ($self) = @_; 1915 my ($self) = @_;
1592 1916
… …
1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1718 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1719 }; 2043 };
1720 2044
1721 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1722 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};
1723 2053
1724 $self->{layout}->render ($self->{ox}, $self->{oy}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725} 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#}
1726 2064
1727############################################################################# 2065#############################################################################
1728 2066
1729package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1730 2068
1731our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1732 2070
1733use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1734 2072
1735sub new { 2073sub new {
1736 my $class = shift; 2074 my $class = shift;
1737 2075
1738 $class->SUPER::new ( 2076 $class->SUPER::new (
… …
1742 active_fg => [0, 0, 0], 2080 active_fg => [0, 0, 0],
1743 can_hover => 1, 2081 can_hover => 1,
1744 can_focus => 1, 2082 can_focus => 1,
1745 valign => 0, 2083 valign => 0,
1746 can_events => 1, 2084 can_events => 1,
2085 ellipsise => 0,
1747 #text => ... 2086 #text => ...
1748 #hidden => "*", 2087 #hidden => "*",
1749 @_ 2088 @_
1750 ) 2089 )
1751} 2090}
… …
1796 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1797 my $uni = $ev->{unicode}; 2136 my $uni = $ev->{unicode};
1798 2137
1799 my $text = $self->get_text; 2138 my $text = $self->get_text;
1800 2139
2140 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2141
1801 if ($uni == 8) { 2142 if ($uni == 8) {
1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803 } elsif ($uni == 127) { 2144 } elsif ($uni == 127) {
1804 substr $text, $self->{cursor}, 1, ""; 2145 substr $text, $self->{cursor}, 1, "";
1805 } elsif ($sym == CFClient::SDLK_LEFT) { 2146 } elsif ($sym == CFPlus::SDLK_LEFT) {
1806 --$self->{cursor} if $self->{cursor}; 2147 --$self->{cursor} if $self->{cursor};
1807 } elsif ($sym == CFClient::SDLK_RIGHT) { 2148 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1808 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2149 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1809 } elsif ($sym == CFClient::SDLK_HOME) { 2150 } elsif ($sym == CFPlus::SDLK_HOME) {
2151 # what a hack
2152 $self->{cursor} =
2153 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2154 ? length $1
2155 : 0;
2156 } elsif ($sym == CFPlus::SDLK_END) {
2157 # uh, again
2158 $self->{cursor} =
2159 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2160 ? $self->{cursor} + length $1
2161 : length $self->{text};
2162 } elsif ($uni == 21) { # ctrl-u
2163 $text = "";
1810 $self->{cursor} = 0; 2164 $self->{cursor} = 0;
1811 } elsif ($sym == CFClient::SDLK_END) {
1812 $self->{cursor} = length $text;
1813 } elsif ($uni == 27) { 2165 } elsif ($uni == 27) {
1814 $self->emit ('escape'); 2166 $self->emit ('escape');
1815 } elsif ($uni) { 2167 } elsif ($uni == 0x0d) {
2168 substr $text, $self->{cursor}++, 0, "\012";
2169 } elsif ($uni >= 0x20) {
1816 substr $text, $self->{cursor}++, 0, chr $uni; 2170 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else { 2171 } else {
1818 return 0; 2172 return 0;
1819 } 2173 }
1820 2174
1821 $self->_set_text ($text); 2175 $self->_set_text ($text);
1822 2176
1823 $self->realloc; 2177 $self->realloc;
2178 $self->update;
1824 2179
1825 1 2180 1
1826} 2181}
1827 2182
1828sub invoke_focus_in { 2183sub invoke_focus_in {
… …
1890 utf8::encode $text; 2245 utf8::encode $text;
1891 2246
1892 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893 } 2248 }
1894 2249
1895 glColor @{$self->{fg}};
1896 glBegin GL_LINES; 2250 glBegin GL_LINES;
1897 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2251 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2252 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899 glEnd; 2253 glEnd;
1900 } 2254 }
1901} 2255}
1902 2256
2257#############################################################################
2258
1903package CFClient::UI::Entry; 2259package CFPlus::UI::Entry;
1904 2260
1905our @ISA = CFClient::UI::EntryBase::; 2261our @ISA = CFPlus::UI::EntryBase::;
1906 2262
1907use CFClient::OpenGL; 2263use CFPlus::OpenGL;
1908 2264
1909sub invoke_key_down { 2265sub invoke_key_down {
1910 my ($self, $ev) = @_; 2266 my ($self, $ev) = @_;
1911 2267
1912 my $sym = $ev->{sym}; 2268 my $sym = $ev->{sym};
1913 2269
1914 if ($sym == 13) { 2270 if ($ev->{uni} == 0x0d || $sym == 13) {
1915 unshift @{$self->{history}}, 2271 unshift @{$self->{history}},
1916 my $txt = $self->get_text; 2272 my $txt = $self->get_text;
1917 2273
1918 $self->{history_pointer} = -1; 2274 $self->{history_pointer} = -1;
1919 $self->{history_saveback} = ''; 2275 $self->{history_saveback} = '';
1920 $self->emit (activate => $txt); 2276 $self->emit (activate => $txt);
1921 $self->update; 2277 $self->update;
1922 2278
1923 } elsif ($sym == CFClient::SDLK_UP) { 2279 } elsif ($sym == CFPlus::SDLK_UP) {
1924 if ($self->{history_pointer} < 0) { 2280 if ($self->{history_pointer} < 0) {
1925 $self->{history_saveback} = $self->get_text; 2281 $self->{history_saveback} = $self->get_text;
1926 } 2282 }
1927 if (@{$self->{history} || []} > 0) { 2283 if (@{$self->{history} || []} > 0) {
1928 $self->{history_pointer}++; 2284 $self->{history_pointer}++;
… …
1930 $self->{history_pointer} = @{$self->{history} || []} - 1; 2286 $self->{history_pointer} = @{$self->{history} || []} - 1;
1931 } 2287 }
1932 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2288 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1933 } 2289 }
1934 2290
1935 } elsif ($sym == CFClient::SDLK_DOWN) { 2291 } elsif ($sym == CFPlus::SDLK_DOWN) {
1936 $self->{history_pointer}--; 2292 $self->{history_pointer}--;
1937 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2293 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938 2294
1939 if ($self->{history_pointer} >= 0) { 2295 if ($self->{history_pointer} >= 0) {
1940 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1949 1 2305 1
1950} 2306}
1951 2307
1952############################################################################# 2308#############################################################################
1953 2309
2310package CFPlus::UI::TextEdit;
2311
2312our @ISA = CFPlus::UI::EntryBase::;
2313
2314use CFPlus::OpenGL;
2315
2316sub move_cursor_ver {
2317 my ($self, $dy) = @_;
2318
2319 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2320
2321 $y += $dy;
2322
2323 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2324 $self->{cursor} = $index;
2325 delete $self->{cur_h};
2326 $self->update;
2327 return;
2328 }
2329}
2330
2331sub invoke_key_down {
2332 my ($self, $ev) = @_;
2333
2334 my $sym = $ev->{sym};
2335
2336 if ($sym == CFPlus::SDLK_UP) {
2337 $self->move_cursor_ver (-1);
2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
2339 $self->move_cursor_ver (+1);
2340 } else {
2341 return $self->SUPER::invoke_key_down ($ev)
2342 }
2343
2344 1
2345}
2346
2347#############################################################################
2348
1954package CFClient::UI::Button; 2349package CFPlus::UI::Button;
1955 2350
1956our @ISA = CFClient::UI::Label::; 2351our @ISA = CFPlus::UI::Label::;
1957 2352
1958use CFClient::OpenGL; 2353use CFPlus::OpenGL;
1959 2354
1960my @tex = 2355my @tex =
1961 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962 qw(b1_button_active.png); 2357 qw(b1_button_inactive.png b1_button_active.png);
1963 2358
1964sub new { 2359sub new {
1965 my $class = shift; 2360 my $class = shift;
1966 2361
1967 $class->SUPER::new ( 2362 $class->SUPER::new (
1968 padding_x => 4, 2363 padding_x => 4,
1969 padding_y => 4, 2364 padding_y => 4,
1970 fg => [1, 1, 1], 2365 fg => [1.0, 1.0, 1.0],
1971 active_fg => [0, 0, 1], 2366 active_fg => [0.8, 0.8, 0.8],
1972 can_hover => 1, 2367 can_hover => 1,
1973 align => 0, 2368 align => 0,
1974 valign => 0, 2369 valign => 0,
1975 can_events => 1, 2370 can_events => 1,
1976 @_ 2371 @_
… …
1994 2389
1995 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1998 2393
2394 my $tex = $tex[$GRAB == $self];
1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000 2396
2001 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
2002 2398
2003 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
2004} 2400}
2005 2401
2006############################################################################# 2402#############################################################################
2007 2403
2404package CFPlus::UI::CheckBox;
2405
2406our @ISA = CFPlus::UI::DrawBG::;
2407
2408my @tex =
2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2410 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2411
2412use CFPlus::OpenGL;
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 2,
2419 padding_y => 2,
2420 fg => [1, 1, 1],
2421 active_fg => [1, 1, 0],
2422 bg => [0, 0, 0, 0.2],
2423 active_bg => [1, 1, 1, 0.5],
2424 state => 0,
2425 can_hover => 1,
2426 @_
2427 )
2428}
2429
2430sub size_request {
2431 my ($self) = @_;
2432
2433 (6) x 2
2434}
2435
2436sub toggle {
2437 my ($self) = @_;
2438
2439 $self->{state} = !$self->{state};
2440 $self->emit (changed => $self->{state});
2441 $self->update;
2442}
2443
2444sub invoke_button_down {
2445 my ($self, $ev, $x, $y) = @_;
2446
2447 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2448 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2449 $self->toggle;
2450 } else {
2451 return 0
2452 }
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 $self->SUPER::_draw;
2461
2462 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2463
2464 my ($w, $h) = @$self{qw(w h)};
2465
2466 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2467
2468 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2469
2470 my $tex = $self->{state} ? $tex[1] : $tex[0];
2471
2472 glEnable GL_TEXTURE_2D;
2473 $tex->draw_quad_alpha (0, 0, $s, $s);
2474 glDisable GL_TEXTURE_2D;
2475}
2476
2477#############################################################################
2478
2479package CFPlus::UI::Image;
2480
2481our @ISA = CFPlus::UI::Base::;
2482
2483use CFPlus::OpenGL;
2484
2485our %texture_cache;
2486
2487sub new {
2488 my $class = shift;
2489
2490 my $self = $class->SUPER::new (
2491 can_events => 0,
2492 @_,
2493 );
2494
2495 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required";
2497
2498 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2499 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2500
2501 CFPlus::weaken $texture_cache{$self->{path}};
2502
2503 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2504
2505 $self
2506}
2507
2508sub STORABLE_freeze {
2509 my ($self, $cloning) = @_;
2510
2511 $self->{path}
2512 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2513
2514 $self->{path}
2515}
2516
2517sub STORABLE_attach {
2518 my ($self, $cloning, $path) = @_;
2519
2520 $self->new (path => $path)
2521}
2522
2523sub size_request {
2524 my ($self) = @_;
2525
2526 ($self->{tex}{w}, $self->{tex}{h})
2527}
2528
2529sub _draw {
2530 my ($self) = @_;
2531
2532 my $tex = $self->{tex};
2533
2534 my ($w, $h) = ($self->{w}, $self->{h});
2535
2536 if ($self->{rot90}) {
2537 glRotate 90, 0, 0, 1;
2538 glTranslate 0, -$self->{w}, 0;
2539
2540 ($w, $h) = ($h, $w);
2541 }
2542
2543 glEnable GL_TEXTURE_2D;
2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2545
2546 $tex->draw_quad (0, 0, $w, $h);
2547
2548 glDisable GL_TEXTURE_2D;
2549}
2550
2551#############################################################################
2552
2008package CFClient::UI::ImageButton; 2553package CFPlus::UI::ImageButton;
2009 2554
2010our @ISA = CFClient::UI::Image::; 2555our @ISA = CFPlus::UI::Image::;
2011 2556
2012use CFClient::OpenGL; 2557use CFPlus::OpenGL;
2013 2558
2014my %textures; 2559my %textures;
2015 2560
2016sub new { 2561sub new {
2017 my $class = shift; 2562 my $class = shift;
… …
2039 1 2584 1
2040} 2585}
2041 2586
2042############################################################################# 2587#############################################################################
2043 2588
2044package CFClient::UI::CheckBox;
2045
2046our @ISA = CFClient::UI::DrawBG::;
2047
2048my @tex =
2049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052use CFClient::OpenGL;
2053
2054sub new {
2055 my $class = shift;
2056
2057 $class->SUPER::new (
2058 padding_x => 2,
2059 padding_y => 2,
2060 fg => [1, 1, 1],
2061 active_fg => [1, 1, 0],
2062 bg => [0, 0, 0, 0.2],
2063 active_bg => [1, 1, 1, 0.5],
2064 state => 0,
2065 can_hover => 1,
2066 @_
2067 )
2068}
2069
2070sub size_request {
2071 my ($self) = @_;
2072
2073 (6) x 2
2074}
2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2084sub invoke_button_down {
2085 my ($self, $ev, $x, $y) = @_;
2086
2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089 $self->toggle;
2090 } else {
2091 return 0
2092 }
2093
2094 1
2095}
2096
2097sub _draw {
2098 my ($self) = @_;
2099
2100 $self->SUPER::_draw;
2101
2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104 my ($w, $h) = @$self{qw(w h)};
2105
2106 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112 glEnable GL_TEXTURE_2D;
2113 $tex->draw_quad_alpha (0, 0, $s, $s);
2114 glDisable GL_TEXTURE_2D;
2115}
2116
2117#############################################################################
2118
2119package CFClient::UI::Image; 2589package CFPlus::UI::VGauge;
2120 2590
2121our @ISA = CFClient::UI::Base::; 2591our @ISA = CFPlus::UI::Base::;
2122
2123use CFClient::OpenGL;
2124
2125our %texture_cache;
2126
2127sub new {
2128 my $class = shift;
2129
2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2134
2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2137
2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145 $self
2146}
2147
2148sub size_request {
2149 my ($self) = @_;
2150
2151 ($self->{tex}{w}, $self->{tex}{h})
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156
2157 my $tex = $self->{tex};
2158
2159 my ($w, $h) = ($self->{w}, $self->{h});
2160
2161 if ($self->{rot90}) {
2162 glRotate 90, 0, 0, 1;
2163 glTranslate 0, -$self->{w}, 0;
2164
2165 ($w, $h) = ($h, $w);
2166 }
2167
2168 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171 $tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173 glDisable GL_TEXTURE_2D;
2174}
2175
2176#############################################################################
2177
2178package CFClient::UI::VGauge;
2179
2180our @ISA = CFClient::UI::Base::;
2181 2592
2182use List::Util qw(min max); 2593use List::Util qw(min max);
2183 2594
2184use CFClient::OpenGL; 2595use CFPlus::OpenGL;
2185 2596
2186my %tex = ( 2597my %tex = (
2187 food => [ 2598 food => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2600 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190 ], 2601 ],
2191 grace => [ 2602 grace => [
2192 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2603 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2604 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194 ], 2605 ],
2195 hp => [ 2606 hp => [
2196 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2608 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198 ], 2609 ],
2199 mana => [ 2610 mana => [
2200 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2612 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202 ], 2613 ],
2203); 2614);
2204 2615
2205# eg. VGauge->new (gauge => 'food'), default gauge: food 2616# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2308 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2309} 2720}
2310 2721
2311############################################################################# 2722#############################################################################
2312 2723
2313package CFClient::UI::Gauge; 2724package CFPlus::UI::Gauge;
2314 2725
2315our @ISA = CFClient::UI::VBox::; 2726our @ISA = CFPlus::UI::VBox::;
2316 2727
2317sub new { 2728sub new {
2318 my ($class, %arg) = @_; 2729 my ($class, %arg) = @_;
2319 2730
2320 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
… …
2322 can_hover => 1, 2733 can_hover => 1,
2323 can_events => 1, 2734 can_events => 1,
2324 %arg, 2735 %arg,
2325 ); 2736 );
2326 2737
2327 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2738 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2739 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2740 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330 2741
2331 $self 2742 $self
2332} 2743}
2333 2744
2334sub set_fontsize { 2745sub set_fontsize {
… …
2355 $self->{value}->set_text ($val); 2766 $self->{value}->set_text ($val);
2356} 2767}
2357 2768
2358############################################################################# 2769#############################################################################
2359 2770
2360package CFClient::UI::Slider; 2771package CFPlus::UI::Slider;
2361 2772
2362use strict; 2773use strict;
2363 2774
2364use CFClient::OpenGL; 2775use CFPlus::OpenGL;
2365 2776
2366our @ISA = CFClient::UI::DrawBG::; 2777our @ISA = CFPlus::UI::DrawBG::;
2367 2778
2368my @tex = 2779my @tex =
2369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2780 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370 qw(s1_slider.png s1_slider_bg.png); 2781 qw(s1_slider.png s1_slider_bg.png);
2371 2782
2372sub new { 2783sub new {
2373 my $class = shift; 2784 my $class = shift;
2374 2785
… …
2442 2853
2443 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2444 2855
2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2446 2857
2447 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2448} 2861}
2449 2862
2450sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2451 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2452 2865
… …
2459 2872
2460 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2873 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2461 } else { 2874 } else {
2462 return 0; 2875 return 0;
2463 } 2876 }
2877
2878 1
2879}
2880
2881sub invoke_mouse_wheel {
2882 my ($self, $ev) = @_;
2883
2884 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2885
2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2887
2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2464 2889
2465 1 2890 1
2466} 2891}
2467 2892
2468sub update { 2893sub update {
… …
2519 glDisable GL_TEXTURE_2D; 2944 glDisable GL_TEXTURE_2D;
2520} 2945}
2521 2946
2522############################################################################# 2947#############################################################################
2523 2948
2524package CFClient::UI::ValSlider; 2949package CFPlus::UI::ValSlider;
2525 2950
2526our @ISA = CFClient::UI::HBox::; 2951our @ISA = CFPlus::UI::HBox::;
2527 2952
2528sub new { 2953sub new {
2529 my ($class, %arg) = @_; 2954 my ($class, %arg) = @_;
2530 2955
2531 my $range = delete $arg{range}; 2956 my $range = delete $arg{range};
2532 2957
2533 my $self = $class->SUPER::new ( 2958 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2959 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2960 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift }, 2961 to_value => sub { shift },
2537 from_value => sub { shift }, 2962 from_value => sub { shift },
2538 %arg, 2963 %arg,
2539 ); 2964 );
2540 2965
… …
2560sub set_range { shift->{slider}->set_range (@_) } 2985sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) } 2986sub set_value { shift->{slider}->set_value (@_) }
2562 2987
2563############################################################################# 2988#############################################################################
2564 2989
2565package CFClient::UI::TextScroller; 2990package CFPlus::UI::TextScroller;
2566 2991
2567our @ISA = CFClient::UI::HBox::; 2992our @ISA = CFPlus::UI::HBox::;
2568 2993
2569use CFClient::OpenGL; 2994use CFPlus::OpenGL;
2570 2995
2571sub new { 2996sub new {
2572 my $class = shift; 2997 my $class = shift;
2573 2998
2574 my $self = $class->SUPER::new ( 2999 my $self = $class->SUPER::new (
2575 fontsize => 1, 3000 fontsize => 1,
2576 can_events => 0, 3001 can_events => 1,
2577 indent => 0, 3002 indent => 0,
2578 #font => default_font 3003 #font => default_font
2579 @_, 3004 @_,
2580 3005
2581 layout => (new CFClient::Layout), 3006 layout => (new CFPlus::Layout),
2582 par => [], 3007 par => [],
3008 max_par => 0,
2583 height => 0, 3009 height => 0,
2584 children => [ 3010 children => [
2585 (new CFClient::UI::Empty expand => 1), 3011 (new CFPlus::UI::Empty expand => 1),
2586 (new CFClient::UI::Slider vertical => 1), 3012 (new CFPlus::UI::Slider vertical => 1),
2587 ], 3013 ],
2588 ); 3014 );
2589 3015
2590 $self->{children}[1]->connect (changed => sub { $self->update }); 3016 $self->{children}[1]->connect (changed => sub { $self->update });
2591 3017
… …
2600} 3026}
2601 3027
2602sub size_request { 3028sub size_request {
2603 my ($self) = @_; 3029 my ($self) = @_;
2604 3030
2605 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
2606 3032
2607 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request 3034 $self->SUPER::size_request
2609} 3035}
2610 3036
… …
2621 3047
2622 $self->reflow; 3048 $self->reflow;
2623 3049
2624 local $self->{children} = [$empty, $slider]; 3050 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 3051 $self->SUPER::invoke_size_allocate ($w, $h)
3052}
3053
3054sub invoke_mouse_wheel {
3055 my ($self, $ev) = @_;
3056
3057 return 0 unless $ev->{dy}; # only vertical movements
3058
3059 $self->{children}[1]->emit (mouse_wheel => $ev);
3060
3061 1
2626} 3062}
2627 3063
2628sub get_layout { 3064sub get_layout {
2629 my ($self, $para) = @_; 3065 my ($self, $para) = @_;
2630 3066
… …
2658 3094
2659 # todo: base offset on lines or so, not on pixels 3095 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset); 3096 $self->{children}[1]->set_value ($offset);
2661} 3097}
2662 3098
3099sub current_paragraph {
3100 my ($self) = @_;
3101
3102 $self->{top_paragraph} - 1
3103}
3104
3105sub scroll_to {
3106 my ($self, $para) = @_;
3107
3108 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3109
3110 $self->{scroll_to} = $para;
3111 $self->update;
3112}
3113
2663sub clear { 3114sub clear {
2664 my ($self) = @_; 3115 my ($self) = @_;
2665 3116
2666 my (undef, undef, @other) = @{ $self->{children} }; 3117 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other; 3118 $self->remove ($_) for @other;
… …
2670 $self->{height} = 0; 3121 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3122 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 3123}
2673 3124
2674sub add_paragraph { 3125sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 3126 my $self = shift;
2676 3127
2677 my ($text, @w) = ref $para ? @$para : $para; 3128 for my $para (@_) {
2678
2679 $para = { 3129 $para = {
3130 fg => [1, 1, 1, 1],
3131 indent => 0,
3132 markup => "",
3133 widget => [],
3134 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 3135 w => 1e10,
2681 wrapped => 1, 3136 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 3137 };
2687 3138
2688 $self->add (@w) if @w; 3139 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 3140 push @{$self->{par}}, $para;
3141 }
3142
3143 if (my $max = $self->{max_par}) {
3144 shift @{$self->{par}} while @{$self->{par}} > $max;
3145 }
2690 3146
2691 $self->{need_reflow}++; 3147 $self->{need_reflow}++;
2692 $self->update; 3148 $self->update;
2693} 3149}
2694 3150
2695sub scroll_to_bottom { 3151sub scroll_to_bottom {
2696 my ($self) = @_; 3152 my ($self) = @_;
2697 3153
2698 $self->{scroll_to_bottom} = 1; 3154 $self->{scroll_to} = $#{$self->{par}};
2699 $self->update; 3155 $self->update;
2700} 3156}
2701 3157
3158sub force_uptodate {
3159 my ($self) = @_;
3160
3161 if (delete $self->{need_reflow}) {
3162 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3163
3164 my $height = 0;
3165
3166 for my $para (@{$self->{par}}) {
3167 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3168 my $layout = $self->get_layout ($para);
3169 my ($w, $h) = $layout->size;
3170
3171 $para->{w} = $w + $para->{indent};
3172 $para->{h} = $h;
3173 $para->{wrapped} = $layout->has_wrapped;
3174 }
3175
3176 $para->{y} = $height;
3177 $height += $para->{h};
3178 }
3179
3180 $self->{height} = $height;
3181 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3182
3183 delete $self->{texture};
3184 }
3185
3186 if (my $paridx = delete $self->{scroll_to}) {
3187 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3188 }
3189}
3190
2702sub update { 3191sub update {
2703 my ($self) = @_; 3192 my ($self) = @_;
2704 3193
2705 $self->SUPER::update; 3194 $self->SUPER::update;
2706 3195
2707 return unless $self->{h} > 0; 3196 return unless $self->{h} > 0;
2708 3197
2709 delete $self->{texture}; 3198 delete $self->{texture};
2710 3199
2711 $ROOT->on_post_alloc ($self => sub { 3200 $ROOT->on_post_alloc ($self => sub {
3201 $self->force_uptodate;
3202
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3203 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713 3204
2714 if (delete $self->{need_reflow}) {
2715 my $height = 0;
2716
2717 for my $para (@{$self->{par}}) {
2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719 my $layout = $self->get_layout ($para);
2720 my ($w, $h) = $layout->size;
2721
2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2725 }
2726
2727 $height += $para->{h};
2728 }
2729
2730 $self->{height} = $height;
2731
2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734 delete $self->{texture};
2735 }
2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3205 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742 glClearColor 0, 0, 0, 0; 3206 glClearColor 0, 0, 0, 0;
2743 glClear GL_COLOR_BUFFER_BIT; 3207 glClear GL_COLOR_BUFFER_BIT;
2744 3208
3209 package CFPlus::UI::Base;
3210 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3211 (0, 0, $self->{w}, $self->{h});
3212
3213 my $top = int $self->{children}[1]{range}[0];
3214
3215 my $paridx = 0;
3216 my $top_paragraph;
2745 my $top = int $self->{children}[1]{range}[0]; 3217 my $top = int $self->{children}[1]{range}[0];
2746 3218
2747 my $y0 = $top; 3219 my $y0 = $top;
2748 my $y1 = $top + $H; 3220 my $y1 = $top + $H;
2749 3221
2750 my $y = 0;
2751
2752 for my $para (@{$self->{par}}) { 3222 for my $para (@{$self->{par}}) {
2753 my $h = $para->{h}; 3223 my $h = $para->{h};
3224 my $y = $para->{y};
2754 3225
2755 if ($y0 < $y + $h && $y < $y1) { 3226 if ($y0 < $y + $h && $y < $y1) {
2756
2757 my $layout = $self->get_layout ($para); 3227 my $layout = $self->get_layout ($para);
2758 3228
2759 $layout->render ($para->{indent}, $y - $y0); 3229 $layout->render ($para->{indent}, $y - $y0);
2760 3230
2761 if (my @w = @{ $para->{widget} }) { 3231 if (my @w = @{ $para->{widget} }) {
… …
2770 $_->draw; 3240 $_->draw;
2771 } 3241 }
2772 } 3242 }
2773 } 3243 }
2774 3244
2775 $y += $h; 3245 $paridx++;
3246 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3247 }
3248
3249 $self->{top_paragraph} = $top_paragraph;
2777 }; 3250 };
2778 }); 3251 });
2779} 3252}
2780 3253
2781sub reconfigure { 3254sub reconfigure {
… …
2799 $self->{children}[1]->draw; 3272 $self->{children}[1]->draw;
2800} 3273}
2801 3274
2802############################################################################# 3275#############################################################################
2803 3276
2804package CFClient::UI::Animator; 3277package CFPlus::UI::Animator;
2805 3278
2806use CFClient::OpenGL; 3279use CFPlus::OpenGL;
2807 3280
2808our @ISA = CFClient::UI::Bin::; 3281our @ISA = CFPlus::UI::Bin::;
2809 3282
2810sub moveto { 3283sub moveto {
2811 my ($self, $x, $y) = @_; 3284 my ($self, $x, $y) = @_;
2812 3285
2813 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3286 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2841 glPopMatrix; 3314 glPopMatrix;
2842} 3315}
2843 3316
2844############################################################################# 3317#############################################################################
2845 3318
2846package CFClient::UI::Flopper; 3319package CFPlus::UI::Flopper;
2847 3320
2848our @ISA = CFClient::UI::Button::; 3321our @ISA = CFPlus::UI::Button::;
2849 3322
2850sub new { 3323sub new {
2851 my $class = shift; 3324 my $class = shift;
2852 3325
2853 my $self = $class->SUPER::new ( 3326 my $self = $class->SUPER::new (
… …
2865 $self->{other}->toggle_visibility; 3338 $self->{other}->toggle_visibility;
2866} 3339}
2867 3340
2868############################################################################# 3341#############################################################################
2869 3342
2870package CFClient::UI::Tooltip; 3343package CFPlus::UI::Tooltip;
2871 3344
2872our @ISA = CFClient::UI::Bin::; 3345our @ISA = CFPlus::UI::Bin::;
2873 3346
2874use CFClient::OpenGL; 3347use CFPlus::OpenGL;
2875 3348
2876sub new { 3349sub new {
2877 my $class = shift; 3350 my $class = shift;
2878 3351
2879 $class->SUPER::new ( 3352 $class->SUPER::new (
… …
2882 ) 3355 )
2883} 3356}
2884 3357
2885sub set_tooltip_from { 3358sub set_tooltip_from {
2886 my ($self, $widget) = @_; 3359 my ($self, $widget) = @_;
3360
3361 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3362 if $widget->{tooltip} =~ /^#(.*)$/;
2887 3363
2888 my $tooltip = $widget->{tooltip}; 3364 my $tooltip = $widget->{tooltip};
2889 3365
2890 if ($ENV{CFPLUS_DEBUG} & 2) { 3366 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n" 3367 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2895 } 3371 }
2896 3372
2897 $tooltip =~ s/^\n+//; 3373 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//; 3374 $tooltip =~ s/\n+$//;
2899 3375
2900 $self->add (new CFClient::UI::Label 3376 $self->add (new CFPlus::UI::Label
2901 markup => $tooltip, 3377 markup => $tooltip,
2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3378 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903 fontsize => 0.8, 3379 fontsize => 0.8,
2904 fg => [0, 0, 0, 1], 3380 style => 1, # FLAG_INVERSE
2905 ellipsise => 0, 3381 ellipsise => 0,
2906 font => ($widget->{tooltip_font} || $::FONT_PROP), 3382 font => ($widget->{tooltip_font} || $::FONT_PROP),
2907 ); 3383 );
2908} 3384}
2909 3385
… …
2928 3404
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3405 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3406 my $widget = $self->{owner}
2931 or return; 3407 or return;
2932 3408
3409 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3410 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3411
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3412 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3413 if $x + $self->{w} > $self->{root}{w};
2937 3414
2938 $self->move_abs ($x, $y); 3415 $self->move_abs ($x, $y);
3416 } else {
3417 $self->hide;
3418 }
2939 }); 3419 });
2940} 3420}
2941 3421
2942sub _draw { 3422sub _draw {
2943 my ($self) = @_; 3423 my ($self) = @_;
… …
2967 $self->SUPER::_draw; 3447 $self->SUPER::_draw;
2968} 3448}
2969 3449
2970############################################################################# 3450#############################################################################
2971 3451
2972package CFClient::UI::Face; 3452package CFPlus::UI::Face;
2973 3453
2974our @ISA = CFClient::UI::Base::; 3454our @ISA = CFPlus::UI::DrawBG::;
2975 3455
2976use CFClient::OpenGL; 3456use CFPlus::OpenGL;
2977 3457
2978sub new { 3458sub new {
2979 my $class = shift; 3459 my $class = shift;
2980 3460
2981 my $self = $class->SUPER::new ( 3461 my $self = $class->SUPER::new (
3462 size_w => 32,
3463 size_h => 8,
2982 aspect => 1, 3464 aspect => 1,
2983 can_events => 0, 3465 can_events => 0,
2984 @_, 3466 @_,
2985 ); 3467 );
2986 3468
2987 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
2989 3471
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2990 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1, 3475 parked => 1,
2993 interval => $self->{animspeed},
2994 cb => sub { 3476 cb => sub {
3477 return unless $::CONN && $widget;
3478
2995 ++$widget->{frame}; 3479 ++$widget->{frame};
3480 $widget->update_face;
2996 $widget->update; 3481 $widget->update;
3482
3483 $widget->update_timer;
2997 }, 3484 },
2998 ); 3485 );
3486
3487 $self->update_face;
3488 $self->update_timer;
2999 } 3489 }
3000 3490
3001 $self 3491 $self
3002} 3492}
3003 3493
3494sub update_timer {
3495 my ($self) = @_;
3496
3497 return unless $self->{timer};
3498
3499 if ($self->{visible}) {
3500 $self->{timer}->at (
3501 $self->{anim_start}
3502 + $self->{animspeed}
3503 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3504 );
3505 $self->{timer}->start;
3506 } else {
3507 $self->{timer}->stop;
3508 }
3509}
3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 }
3522 }
3523}
3524
3004sub size_request { 3525sub size_request {
3005 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3535 $self->realloc;
3536 });
3537 }
3538 }
3539 }
3540
3541 ($self->{size_w} || 8, $self->{size_h} || 8)
3006} 3542}
3007 3543
3008sub update { 3544sub update {
3009 my ($self) = @_; 3545 my ($self) = @_;
3010 3546
3011 return unless $self->{visible}; 3547 return unless $self->{visible};
3012 3548
3013 $self->SUPER::update; 3549 $self->SUPER::update;
3014} 3550}
3015 3551
3552sub invoke_visibility_change {
3553 my ($self) = @_;
3554
3555 $self->update_timer;
3556
3557 0
3558}
3559
3016sub _draw { 3560sub _draw {
3017 my ($self) = @_; 3561 my ($self) = @_;
3018 3562
3019 return unless $::CONN; 3563 $self->SUPER::_draw;
3020 3564
3021 my $face; 3565 if (my $tex = $self->{tex}) {
3022
3023 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}];
3025
3026 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim;
3028 }
3029
3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3031
3032 if ($tex) {
3033 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3037 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3039} 3572}
3040 3573
3041sub destroy { 3574sub destroy {
3042 my ($self) = @_; 3575 my ($self) = @_;
3043 3576
3044 $self->{timer}->cancel 3577 (delete $self->{timer})->cancel
3045 if $self->{timer}; 3578 if $self->{timer};
3046 3579
3047 $self->SUPER::destroy; 3580 $self->SUPER::destroy;
3048} 3581}
3049 3582
3050############################################################################# 3583#############################################################################
3051 3584
3052package CFClient::UI::Buttonbar; 3585package CFPlus::UI::Buttonbar;
3053 3586
3054our @ISA = CFClient::UI::HBox::; 3587our @ISA = CFPlus::UI::HBox::;
3055 3588
3056# TODO: should actualyl wrap buttons and other goodies. 3589# TODO: should actually wrap buttons and other goodies.
3057 3590
3058############################################################################# 3591#############################################################################
3059 3592
3060package CFClient::UI::Menu; 3593package CFPlus::UI::Menu;
3061 3594
3062our @ISA = CFClient::UI::FancyFrame::; 3595our @ISA = CFPlus::UI::Toplevel::;
3063 3596
3064use CFClient::OpenGL; 3597use CFPlus::OpenGL;
3065 3598
3066sub new { 3599sub new {
3067 my $class = shift; 3600 my $class = shift;
3068 3601
3069 my $self = $class->SUPER::new ( 3602 my $self = $class->SUPER::new (
3070 items => [], 3603 items => [],
3071 z => 100, 3604 z => 100,
3072 @_, 3605 @_,
3073 ); 3606 );
3074 3607
3075 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3608 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076 3609
3077 for my $item (@{ $self->{items} }) { 3610 for my $item (@{ $self->{items} }) {
3078 my ($widget, $cb, $tooltip) = @$item; 3611 my ($widget, $cb, $tooltip) = @$item;
3079 3612
3080 # handle various types of items, only text for now 3613 # handle various types of items, only text for now
3081 if (!ref $widget) { 3614 if (!ref $widget) {
3082 if ($widget =~ /\t/) { 3615 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2; 3616 my ($left, $right) = split /\t/, $widget, 2;
3084 3617
3085 $widget = new CFClient::UI::HBox 3618 $widget = new CFPlus::UI::HBox
3086 can_hover => 1, 3619 can_hover => 1,
3087 can_events => 1, 3620 can_events => 1,
3088 tooltip => $tooltip, 3621 tooltip => $tooltip,
3089 children => [ 3622 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1), 3623 (new CFPlus::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1), 3624 (new CFPlus::UI::Label markup => $right, align => +1),
3092 ], 3625 ],
3093 ; 3626 ;
3094 3627
3095 } else { 3628 } else {
3096 $widget = new CFClient::UI::Label 3629 $widget = new CFPlus::UI::Label
3097 can_hover => 1, 3630 can_hover => 1,
3098 can_events => 1, 3631 can_events => 1,
3099 markup => $widget, 3632 markup => $widget,
3100 tooltip => $tooltip; 3633 tooltip => $tooltip;
3101 } 3634 }
… …
3149 1 3682 1
3150} 3683}
3151 3684
3152############################################################################# 3685#############################################################################
3153 3686
3154package CFClient::UI::Multiplexer; 3687package CFPlus::UI::Multiplexer;
3155 3688
3156our @ISA = CFClient::UI::Container::; 3689our @ISA = CFPlus::UI::Container::;
3157 3690
3158sub new { 3691sub new {
3159 my $class = shift; 3692 my $class = shift;
3160 3693
3161 my $self = $class->SUPER::new ( 3694 my $self = $class->SUPER::new (
… …
3222 $self->{current}->draw; 3755 $self->{current}->draw;
3223} 3756}
3224 3757
3225############################################################################# 3758#############################################################################
3226 3759
3227package CFClient::UI::Notebook; 3760package CFPlus::UI::Notebook;
3228 3761
3229our @ISA = CFClient::UI::VBox::; 3762our @ISA = CFPlus::UI::VBox::;
3230 3763
3231sub new { 3764sub new {
3232 my $class = shift; 3765 my $class = shift;
3233 3766
3234 my $self = $class->SUPER::new ( 3767 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar), 3768 buttonbar => (new CFPlus::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self 3770 # filter => # will be put between multiplexer and $self
3238 @_, 3771 @_,
3239 ); 3772 );
3240 3773
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3242 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3243 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3244 $self 3811 $self
3245} 3812}
3246 3813
3247sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3248 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3249 3828
3250 Scalar::Util::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3251 3831
3252 $self->{buttonbar}->add (new CFClient::UI::Button
3253 markup => $title,
3254 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) },
3256 );
3257
3258 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3259} 3833}
3260 3834
3261sub get_current_page { 3835sub get_current_page {
3262 my ($self) = @_; 3836 my ($self) = @_;
3263 3837
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3845 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3846}
3273 3847
3274############################################################################# 3848#############################################################################
3275 3849
3276package CFClient::UI::Combobox; 3850package CFPlus::UI::Selector;
3277 3851
3278use utf8; 3852use utf8;
3279 3853
3280our @ISA = CFClient::UI::Button::; 3854our @ISA = CFPlus::UI::Button::;
3281 3855
3282sub new { 3856sub new {
3283 my $class = shift; 3857 my $class = shift;
3284 3858
3285 my $self = $class->SUPER::new ( 3859 my $self = $class->SUPER::new (
… …
3302 my ($value, $title, $tooltip) = @$_; 3876 my ($value, $title, $tooltip) = @$_;
3303 3877
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3878 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 } 3879 }
3306 3880
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3881 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308} 3882}
3309 3883
3310sub _set_value { 3884sub _set_value {
3311 my ($self, $value) = @_; 3885 my ($self, $value) = @_;
3312 3886
… …
3327 $self->emit (changed => $value); 3901 $self->emit (changed => $value);
3328} 3902}
3329 3903
3330############################################################################# 3904#############################################################################
3331 3905
3332package CFClient::UI::Statusbox; 3906package CFPlus::UI::Statusbox;
3333 3907
3334our @ISA = CFClient::UI::VBox::; 3908our @ISA = CFPlus::UI::VBox::;
3335 3909
3336sub new { 3910sub new {
3337 my $class = shift; 3911 my $class = shift;
3338 3912
3339 my $self = $class->SUPER::new ( 3913 my $self = $class->SUPER::new (
3340 fontsize => 0.8, 3914 fontsize => 0.8,
3341 @_, 3915 @_,
3342 ); 3916 );
3343 3917
3344 Scalar::Util::weaken (my $this = $self); 3918 CFPlus::weaken (my $this = $self);
3345 3919
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3920 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347 3921
3348 $self 3922 $self
3349} 3923}
… …
3351sub reorder { 3925sub reorder {
3352 my ($self) = @_; 3926 my ($self) = @_;
3353 my $NOW = Time::HiRes::time; 3927 my $NOW = Time::HiRes::time;
3354 3928
3355 # freeze display when hovering over any label 3929 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner} 3930 return if $CFPlus::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3931 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} }; 3932 values %{ $self->{item} };
3359 3933
3360 while (my ($k, $v) = each %{ $self->{item} }) { 3934 while (my ($k, $v) = each %{ $self->{item} }) {
3361 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3935 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362 } 3936 }
… …
3383 for ($short) { 3957 for ($short) {
3384 s/^\s+//; 3958 s/^\s+//;
3385 s/\s+/ /g; 3959 s/\s+/ /g;
3386 } 3960 }
3387 3961
3388 new CFClient::UI::Label 3962 new CFPlus::UI::Label
3389 markup => $short, 3963 markup => $short,
3390 tooltip => $item->{tooltip}, 3964 tooltip => $item->{tooltip},
3391 tooltip_font => $::FONT_PROP, 3965 tooltip_font => $::FONT_PROP,
3392 tooltip_width => 0.67, 3966 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize}, 3967 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3472 $self->SUPER::destroy; 4046 $self->SUPER::destroy;
3473} 4047}
3474 4048
3475############################################################################# 4049#############################################################################
3476 4050
3477package CFClient::UI::Inventory;
3478
3479our @ISA = CFClient::UI::Table::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3532
3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
3619 my ($self, $spell) = @_;
3620
3621 $self->{spell}->{$spell->{name}} = $spell;
3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3641package CFClient::UI::Root; 4051package CFPlus::UI::Root;
3642 4052
3643our @ISA = CFClient::UI::Container::; 4053our @ISA = CFPlus::UI::Container::;
3644 4054
3645use List::Util qw(min max); 4055use List::Util qw(min max);
3646 4056
3647use CFClient::OpenGL; 4057use CFPlus::OpenGL;
3648 4058
3649sub new { 4059sub new {
3650 my $class = shift; 4060 my $class = shift;
3651 4061
3652 my $self = $class->SUPER::new ( 4062 my $self = $class->SUPER::new (
3653 visible => 1, 4063 visible => 1,
3654 @_, 4064 @_,
3655 ); 4065 );
3656 4066
3657 Scalar::Util::weaken ($self->{root} = $self); 4067 CFPlus::weaken ($self->{root} = $self);
3658 4068
3659 $self 4069 $self
3660} 4070}
3661 4071
3662sub size_request { 4072sub size_request {
… …
3757 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
3758 $_->() 4168 $_->()
3759 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
3760 } 4170 }
3761 4171
3762 if ($self->{realloc}) { 4172 while ($self->{realloc}) {
3763 my %queue; 4173 my %queue;
3764 my @queue; 4174 my @queue;
3765 my $widget; 4175 my $widget;
3766 4176
3767 outer: 4177 outer:
… …
3814 } 4224 }
3815 } 4225 }
3816 4226
3817 delete $self->{realloc}{$widget+0}; 4227 delete $self->{realloc}{$widget+0};
3818 } 4228 }
3819 }
3820 4229
3821 while (my $size_alloc = delete $self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
3822 my @queue = sort { $b->{visible} <=> $a->{visible} } 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
3823 values %$size_alloc; 4232 values %$size_alloc;
3824 4233
3825 while () { 4234 while () {
3826 my $widget = pop @queue || last; 4235 my $widget = pop @queue || last;
3827 4236
3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3829 4238
3830 $w = 0 if $w < 0;
3831 $h = 0 if $h < 0;
3832
3833 $w = max $widget->{min_w}, $w; 4239 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 4240 $h = max $widget->{min_h}, $h;
3835 4241
4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4244
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 4247
3839 $w = int $w + 0.5; 4248 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 4249 $h = int $h + 0.5;
3841 4250
3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843 $widget->{old_w} = $widget->{w}; 4252 $widget->{old_w} = $widget->{w};
3844 $widget->{old_h} = $widget->{h}; 4253 $widget->{old_h} = $widget->{h};
3845 4254
3846 $widget->{w} = $w; 4255 $widget->{w} = $w;
3847 $widget->{h} = $h; 4256 $widget->{h} = $h;
3848 4257
3849 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
3850 } 4260 }
3851 } 4261 }
3852 } 4262 }
3853 4263
3854 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {
3855 $_->() 4265 $_->()
3856 for values %{delete $self->{post_alloc_hook}}; 4266 for values %{delete $self->{post_alloc_hook}};
3857 } 4267 }
3858
3859 4268
3860 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4269 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4270 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862 glClear GL_COLOR_BUFFER_BIT; 4271 glClear GL_COLOR_BUFFER_BIT;
3863 4272
… …
3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4275 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867 glMatrixMode GL_MODELVIEW; 4276 glMatrixMode GL_MODELVIEW;
3868 glLoadIdentity; 4277 glLoadIdentity;
3869 4278
3870 { 4279 {
3871 package CFClient::UI::Base; 4280 package CFPlus::UI::Base;
3872 4281
3873 ($draw_x, $draw_y, $draw_w, $draw_h) = 4282 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h}); 4283 (0, 0, $self->{w}, $self->{h});
3875 }
3876 4284
3877 $self->_draw; 4285 $self->_draw;
4286 }
3878} 4287}
3879 4288
3880############################################################################# 4289#############################################################################
3881 4290
3882package CFClient::UI; 4291package CFPlus::UI;
3883 4292
3884$ROOT = new CFClient::UI::Root; 4293$ROOT = new CFPlus::UI::Root;
3885$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4294$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886 4295
38871 42961
3888 4297

Diff Legend

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