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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

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

Diff Legend

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